kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmStandardIncludes-cleanup' 

af65da0a cmStandardIncludes: Remove list include.
e848cc50 cmStandardIncludes: Remove deque include.
5fea6898 cmStandardIncludes: Remove some VS6 workarounds.
This commit is contained in:
Brad King 2015-02-10 12:56:08 -05:00 committed by CMake Topic Stage
parent 2fd44b082b af65da0aa9
commit cbffbf7437
13 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/CPack/cmCPackGenerator.cxx
View File

@ -25,6 +25,7 @@
#include <cmsys/Glob.hxx> #include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx> #include <cmsys/FStream.hxx>
#include <algorithm> #include <algorithm>
#include <list>
#if defined(__HAIKU__) #if defined(__HAIKU__)
#include <FindDirectory.h> #include <FindDirectory.h>

2
Source/CTest/cmCTestBuildHandler.h
View File

@ -19,6 +19,8 @@
#include <cmsys/RegularExpression.hxx> #include <cmsys/RegularExpression.hxx>
#include <deque>
class cmMakefile; class cmMakefile;
/** \class cmCTestBuildHandler /** \class cmCTestBuildHandler

2
Source/CTest/cmCTestGlobalVC.h
View File

@ -14,6 +14,8 @@
#include "cmCTestVC.h" #include "cmCTestVC.h"
#include <list>
/** \class cmCTestGlobalVC /** \class cmCTestGlobalVC
* \brief Base class for handling globally-versioned trees * \brief Base class for handling globally-versioned trees
* *

1
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@ -16,6 +16,7 @@
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include <stdlib.h> #include <stdlib.h>
#include <stack> #include <stack>
#include <list>
#include <float.h> #include <float.h>
#include <cmsys/FStream.hxx> #include <cmsys/FStream.hxx>

2
Source/CTest/cmCTestSVN.h
View File

@ -14,6 +14,8 @@
#include "cmCTestGlobalVC.h" #include "cmCTestGlobalVC.h"
#include <list>
/** \class cmCTestSVN /** \class cmCTestSVN
* \brief Interaction with subversion command-line tool * \brief Interaction with subversion command-line tool
* *

2
Source/cmCommands.h
View File

@ -13,6 +13,8 @@
#define cmCommands_h #define cmCommands_h
#include "cmStandardIncludes.h" #include "cmStandardIncludes.h"
#include <list>
class cmCommand; class cmCommand;
/** /**
* Global function to return all compiled in commands. * Global function to return all compiled in commands.

2
Source/cmConditionEvaluator.h
View File

@ -15,6 +15,8 @@
#include "cmCommand.h" #include "cmCommand.h"
#include "cmExpandedCommandArgument.h" #include "cmExpandedCommandArgument.h"
#include <list>
class cmConditionEvaluator class cmConditionEvaluator
{ {
public: public:

2
Source/cmFileLockPool.h
View File

@ -14,6 +14,8 @@
#include "cmStandardIncludes.h" #include "cmStandardIncludes.h"
#include <list>
class cmFileLockResult; class cmFileLockResult;
class cmFileLock; class cmFileLock;

1
Source/cmMakefile.cxx
View File

@ -38,6 +38,7 @@
#include <cmsys/auto_ptr.hxx> #include <cmsys/auto_ptr.hxx>
#include <stack> #include <stack>
#include <list>
#include <ctype.h> // for isspace #include <ctype.h> // for isspace
#include <assert.h> #include <assert.h>

1
Source/cmMakefile.h
View File

@ -35,6 +35,7 @@
#endif #endif
#include <stack> #include <stack>
#include <deque>
class cmFunctionBlocker; class cmFunctionBlocker;
class cmCommand; class cmCommand;

2
Source/cmQtAutoGenerators.h
View File

@ -14,6 +14,8 @@
#ifndef cmQtAutoGenerators_h #ifndef cmQtAutoGenerators_h
#define cmQtAutoGenerators_h #define cmQtAutoGenerators_h
#include <list>
class cmGlobalGenerator; class cmGlobalGenerator;
class cmMakefile; class cmMakefile;

12
Source/cmStandardIncludes.h
View File

@ -22,7 +22,6 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning ( disable : 4786 ) #pragma warning ( disable : 4786 )
#pragma warning ( disable : 4503 ) #pragma warning ( disable : 4503 )
#pragma warning ( disable : 4512 ) /* operator=() could not be generated */
#endif #endif
@ -42,11 +41,6 @@
# include <cmsys/IOStream.hxx> # include <cmsys/IOStream.hxx>
#endif #endif
// Avoid warnings in system headers.
#if defined(_MSC_VER)
# pragma warning (push,1)
#endif
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
@ -59,13 +53,7 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <map> #include <map>
#include <list>
#include <set> #include <set>
#include <deque>
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
// include the "c" string header // include the "c" string header
#include <string.h> #include <string.h>

2
Source/cmake.cxx
View File

@ -103,6 +103,8 @@
#include <sys/stat.h> // struct stat #include <sys/stat.h> // struct stat
#include <list>
static bool cmakeCheckStampFile(const char* stampName); static bool cmakeCheckStampFile(const char* stampName);
static bool cmakeCheckStampList(const char* stampName); static bool cmakeCheckStampList(const char* stampName);