Merge topic 'cmStandardIncludes-cleanup'

af65da0a cmStandardIncludes: Remove list include.
e848cc50 cmStandardIncludes: Remove deque include.
5fea6898 cmStandardIncludes: Remove some VS6 workarounds.

13 files changed, 20 insertions, 12 deletions

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 <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
 #include <algorithm>
+#include <list>
 
 #if defined(__HAIKU__)
 #include <FindDirectory.h>
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 <cmsys/RegularExpression.hxx>
 
+#include <deque>
+
 class cmMakefile;
 
 /** \class cmCTestBuildHandler
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 <list>
+
 /** \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 <stdlib.h>
 #include <stack>
+#include <list>
 #include <float.h>
 #include <cmsys/FStream.hxx>
 
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 <list>
+
 /** \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 <list>
+
 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 <list>
+
 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 <list>
+
 class cmFileLockResult;
 class cmFileLock;
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e709b9f..eb68e49 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -38,6 +38,7 @@
 #include <cmsys/auto_ptr.hxx>
 
 #include <stack>
+#include <list>
 #include <ctype.h> // for isspace
 #include <assert.h>
 
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 5f22485..895a2fc 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -35,6 +35,7 @@
 #endif
 
 #include <stack>
+#include <deque>
 
 class cmFunctionBlocker;
 class cmCommand;
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 <list>
+
 class cmGlobalGenerator;
 class cmMakefile;
 
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 646300d..77b4f62 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>
@@ -59,13 +53,7 @@
 #include <algorithm>
 #include <functional>
 #include <map>
-#include <list>
 #include <set>
-#include <deque>
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif
 
 // include the "c" string header
 #include <string.h>
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 875dbbd..47be481 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -103,6 +103,8 @@
 
 #include <sys/stat.h> // struct stat
 
+#include <list>
+
 static bool cmakeCheckStampFile(const char* stampName);
 static bool cmakeCheckStampList(const char* stampName);