diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-10 17:56:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-10 17:56:08 (GMT) |
| commit | cbffbf7437ea2d571e26bedee032c23be9347d94 (patch) | |
| tree | ecd39316ec65c1fff7a75972b0bfee28e0a6bedd /Source/cmStandardIncludes.h | |
| parent | 2fd44b082b0a8e546c73d921f9d8264a668c3b78 (diff) | |
| parent | af65da0aa97f20947f93ddcf9872d23d671f699b (diff) | |
| download | CMake-cbffbf7437ea2d571e26bedee032c23be9347d94.zip CMake-cbffbf7437ea2d571e26bedee032c23be9347d94.tar.gz CMake-cbffbf7437ea2d571e26bedee032c23be9347d94.tar.bz2 | |
Merge topic 'cmStandardIncludes-cleanup'
af65da0a cmStandardIncludes: Remove list include.
e848cc50 cmStandardIncludes: Remove deque include.
5fea6898 cmStandardIncludes: Remove some VS6 workarounds.
Diffstat (limited to 'Source/cmStandardIncludes.h')
| -rw-r--r-- | Source/cmStandardIncludes.h | 12 |
1 files changed, 0 insertions, 12 deletions
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> |