summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-01-12 20:05:34 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-02-06 18:04:53 (GMT)
commit5fea6898346f30119b7f5272033b0713aca4c389 (patch)
treeb3d5aedbf3b6d2e7407c8cc7bc40ee79730ead74
parent098160d5f2a1aa35d2f14c585dd87cefd8f56f41 (diff)
downloadCMake-5fea6898346f30119b7f5272033b0713aca4c389.zip
CMake-5fea6898346f30119b7f5272033b0713aca4c389.tar.gz
CMake-5fea6898346f30119b7f5272033b0713aca4c389.tar.bz2
cmStandardIncludes: Remove some VS6 workarounds.
Added in commit v2.6.0~2824 (COMP: Fix warnings in system headers on VS6., 2006-08-29), but no longer needed.
-rw-r--r--Source/cmStandardIncludes.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 646300d..99e1868 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -22,7 +22,6 @@
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#pragma warning ( disable : 4503 )
-#pragma warning ( disable : 4512 ) /* operator=() could not be generated */
#endif
@@ -42,11 +41,6 @@
# include <cmsys/IOStream.hxx>
#endif
-// Avoid warnings in system headers.
-#if defined(_MSC_VER)
-# pragma warning (push,1)
-#endif
-
#include <fstream>
#include <iostream>
#include <iomanip>
@@ -63,10 +57,6 @@
#include <set>
#include <deque>
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif
-
// include the "c" string header
#include <string.h>
#include <stdio.h>