This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via c9827dabebf5d3e93d2f37223141f2ccd5209b1a (commit)
via 17a2adc29de90c6ce441f7fff5cf9366286de3d6 (commit)
via af65da0aa97f20947f93ddcf9872d23d671f699b (commit)
via e848cc5074c402fe38bb19c831f0b71dc34ece73 (commit)
via 5fea6898346f30119b7f5272033b0713aca4c389 (commit)
from ed2953e57b017f3bbfb189658c98a34dd44d9993 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9827dabebf5d3e93d2f37223141f2ccd5209b1a
commit c9827dabebf5d3e93d2f37223141f2ccd5209b1a
Merge: ed2953e 17a2adc
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Feb 6 13:05:10 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 6 13:05:10 2015 -0500
Merge topic 'cmStandardIncludes-cleanup' into next
17a2adc2 cmStandardIncludes: Remove functional header.
af65da0a cmStandardIncludes: Remove list include.
e848cc50 cmStandardIncludes: Remove deque include.
5fea6898 cmStandardIncludes: Remove some VS6 workarounds.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a2adc29de90c6ce441f7fff5cf9366286de3d6
commit 17a2adc29de90c6ce441f7fff5cf9366286de3d6
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Feb 5 22:08:53 2015 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Feb 6 19:04:53 2015 +0100
cmStandardIncludes: Remove functional header.
It is unused.
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 77b4f62..0909719 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -51,7 +51,6 @@
#include <string>
#include <iterator>
#include <algorithm>
-#include <functional>
#include <map>
#include <set>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af65da0aa97f20947f93ddcf9872d23d671f699b
commit af65da0aa97f20947f93ddcf9872d23d671f699b
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 12 21:17:55 2015 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Feb 6 19:04:53 2015 +0100
cmStandardIncludes: Remove list include.
Include it only where used.
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/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 ba914e1..ff3e35d 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/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 180bd8d..77b4f62 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -53,7 +53,6 @@
#include <algorithm>
#include <functional>
#include <map>
-#include <list>
#include <set>
// 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 <sys/stat.h> // struct stat
+#include <list>
+
static bool cmakeCheckStampFile(const char* stampName);
static bool cmakeCheckStampList(const char* stampName);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e848cc5074c402fe38bb19c831f0b71dc34ece73
commit e848cc5074c402fe38bb19c831f0b71dc34ece73
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 12 21:11:16 2015 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Feb 6 19:04:53 2015 +0100
cmStandardIncludes: Remove deque include.
Include it only where used.
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/cmMakefile.h b/Source/cmMakefile.h
index bff8c12..110db24 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/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 99e1868..180bd8d 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -55,7 +55,6 @@
#include <map>
#include <list>
#include <set>
-#include <deque>
// include the "c" string header
#include <string.h>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fea6898346f30119b7f5272033b0713aca4c389
commit 5fea6898346f30119b7f5272033b0713aca4c389
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 12 21:05:34 2015 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Feb 6 19:04:53 2015 +0100
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.
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>
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
