From 5fea6898346f30119b7f5272033b0713aca4c389 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 12 Jan 2015 21:05:34 +0100 Subject: 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. --- Source/cmStandardIncludes.h | 10 ---------- 1 file changed, 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 #endif -// Avoid warnings in system headers. -#if defined(_MSC_VER) -# pragma warning (push,1) -#endif - #include #include #include @@ -63,10 +57,6 @@ #include #include -#if defined(_MSC_VER) -# pragma warning(pop) -#endif - // include the "c" string header #include #include -- cgit v0.12 From e848cc5074c402fe38bb19c831f0b71dc34ece73 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 12 Jan 2015 21:11:16 +0100 Subject: cmStandardIncludes: Remove deque include. Include it only where used. --- Source/CTest/cmCTestBuildHandler.h | 2 ++ Source/cmMakefile.h | 1 + Source/cmStandardIncludes.h | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index 09346f9..d13d5cf 100644 --- a/Source/CTest/cmCTestBuildHandler.h +++ b/Source/CTest/cmCTestBuildHandler.h @@ -19,6 +19,8 @@ #include +#include + class cmMakefile; /** \class cmCTestBuildHandler diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index bff8c12..110db24 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -35,6 +35,7 @@ #endif #include +#include class cmFunctionBlocker; class cmCommand; diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 99e1868..180bd8d 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -55,7 +55,6 @@ #include #include #include -#include // include the "c" string header #include -- cgit v0.12 From af65da0aa97f20947f93ddcf9872d23d671f699b Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 12 Jan 2015 21:17:55 +0100 Subject: cmStandardIncludes: Remove list include. Include it only where used. --- Source/CPack/cmCPackGenerator.cxx | 1 + Source/CTest/cmCTestGlobalVC.h | 2 ++ Source/CTest/cmCTestMultiProcessHandler.cxx | 1 + Source/CTest/cmCTestSVN.h | 2 ++ Source/cmCommands.h | 2 ++ Source/cmConditionEvaluator.h | 2 ++ Source/cmFileLockPool.h | 2 ++ Source/cmMakefile.cxx | 1 + Source/cmQtAutoGenerators.h | 2 ++ Source/cmStandardIncludes.h | 1 - Source/cmake.cxx | 2 ++ 11 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 1c670d2..006239a 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #if defined(__HAIKU__) #include diff --git a/Source/CTest/cmCTestGlobalVC.h b/Source/CTest/cmCTestGlobalVC.h index cb0d165..29e0a61 100644 --- a/Source/CTest/cmCTestGlobalVC.h +++ b/Source/CTest/cmCTestGlobalVC.h @@ -14,6 +14,8 @@ #include "cmCTestVC.h" +#include + /** \class cmCTestGlobalVC * \brief Base class for handling globally-versioned trees * diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index f9e8a3c..f223127 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -16,6 +16,7 @@ #include "cmSystemTools.h" #include #include +#include #include #include diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h index c6548e3..17bf7cb 100644 --- a/Source/CTest/cmCTestSVN.h +++ b/Source/CTest/cmCTestSVN.h @@ -14,6 +14,8 @@ #include "cmCTestGlobalVC.h" +#include + /** \class cmCTestSVN * \brief Interaction with subversion command-line tool * diff --git a/Source/cmCommands.h b/Source/cmCommands.h index c56673f..e902853 100644 --- a/Source/cmCommands.h +++ b/Source/cmCommands.h @@ -13,6 +13,8 @@ #define cmCommands_h #include "cmStandardIncludes.h" +#include + class cmCommand; /** * Global function to return all compiled in commands. diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h index 01624f9..fcef234 100644 --- a/Source/cmConditionEvaluator.h +++ b/Source/cmConditionEvaluator.h @@ -15,6 +15,8 @@ #include "cmCommand.h" #include "cmExpandedCommandArgument.h" +#include + class cmConditionEvaluator { public: diff --git a/Source/cmFileLockPool.h b/Source/cmFileLockPool.h index baef310..f0614a3 100644 --- a/Source/cmFileLockPool.h +++ b/Source/cmFileLockPool.h @@ -14,6 +14,8 @@ #include "cmStandardIncludes.h" +#include + class cmFileLockResult; class cmFileLock; diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ba914e1..ff3e35d 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -38,6 +38,7 @@ #include #include +#include #include // for isspace #include diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 79fa5df..f74e3c5 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -14,6 +14,8 @@ #ifndef cmQtAutoGenerators_h #define cmQtAutoGenerators_h +#include + class cmGlobalGenerator; class cmMakefile; diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 180bd8d..77b4f62 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -53,7 +53,6 @@ #include #include #include -#include #include // include the "c" string header diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 652e451..4b6af0a 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -103,6 +103,8 @@ #include // struct stat +#include + static bool cmakeCheckStampFile(const char* stampName); static bool cmakeCheckStampList(const char* stampName); -- cgit v0.12