[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-356-g85bdd35

[Daniel Pfeifer]

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  85bdd3582b2a771107b1552c978aac50deff0868 (commit)
       via  e6326db0c3870691e085df32e9af117f7c27ee2a (commit)
      from  7f71c4e28b43f1eaa78a0227f97eac653eabebe0 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85bdd3582b2a771107b1552c978aac50deff0868
commit 85bdd3582b2a771107b1552c978aac50deff0868
Merge: 7f71c4e e6326db
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Jun 16 18:18:34 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 16 18:18:34 2016 -0400

    Merge topic 'iwyu-test' into next
    
    e6326db0 Revert "Apply include-what-you-use to some example files"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6326db0c3870691e085df32e9af117f7c27ee2a
commit e6326db0c3870691e085df32e9af117f7c27ee2a
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Jun 17 00:18:13 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Fri Jun 17 00:18:13 2016 +0200

    Revert "Apply include-what-you-use to some example files"
    
    This reverts commit a3e364aab92c1bdda63b39e3a7973a46919e3b6a.

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index f4349b5..235cf88 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -14,15 +14,9 @@
 #include "cmLocale.h"
 #include "cmSystemTools.h"
 #include "cm_get_date.h"
-
 #include <cm_libarchive.h>
-#include <cmsys/Configure.hxx>
 #include <cmsys/Directory.hxx>
-#include <cmsys/Encoding.hxx>
 #include <cmsys/FStream.hxx>
-#include <iostream>
-#include <string.h>
-#include <time.h>
 
 #ifndef __LA_SSIZE_T
 #define __LA_SSIZE_T la_ssize_t
diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h
index 65e1c24..72d8f3a 100644
--- a/Source/cmArchiveWrite.h
+++ b/Source/cmArchiveWrite.h
@@ -12,12 +12,7 @@
 #ifndef cmArchiveWrite_h
 #define cmArchiveWrite_h
 
-#include <cmConfigure.h> // IWYU pragma: keep
-
-#include <iosfwd>
-#include <stddef.h>
-#include <string>
-#include <sys/types.h>
+#include "cmStandardIncludes.h"
 
 #if !defined(CMAKE_BUILD_WITH_CMAKE)
 #error "cmArchiveWrite not allowed during bootstrap build!"
diff --git a/Source/cmCLocaleEnvironmentScope.cxx b/Source/cmCLocaleEnvironmentScope.cxx
index 0e381db..a19dbae 100644
--- a/Source/cmCLocaleEnvironmentScope.cxx
+++ b/Source/cmCLocaleEnvironmentScope.cxx
@@ -15,7 +15,6 @@
 #include "cmSystemTools.h"
 
 #include <sstream>
-#include <utility>
 
 cmCLocaleEnvironmentScope::cmCLocaleEnvironmentScope()
 {
diff --git a/Source/cmCLocaleEnvironmentScope.h b/Source/cmCLocaleEnvironmentScope.h
index 572beaf..b011741 100644
--- a/Source/cmCLocaleEnvironmentScope.h
+++ b/Source/cmCLocaleEnvironmentScope.h
@@ -13,10 +13,7 @@
 #ifndef cmCLocaleEnvironmentScope_h
 #define cmCLocaleEnvironmentScope_h
 
-#include <cmConfigure.h> // IWYU pragma: keep
-
-#include <map>
-#include <string>
+#include "cmStandardIncludes.h"
 
 class cmCLocaleEnvironmentScope
 {
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 25f7cd3..bcef3c8 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -16,11 +16,10 @@
 #include "cmVersion.h"
 #include "cmake.h"
 
-#include <algorithm>
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
 #include <cmsys/Glob.hxx>
-#include <sstream>
-#include <stdio.h>
-#include <string.h>
+#include <cmsys/RegularExpression.hxx>
 
 cmCacheManager::cmCacheManager()
 {
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 8ae563b..153e957 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -12,19 +12,12 @@
 #ifndef cmCacheManager_h
 #define cmCacheManager_h
 
-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmStandardIncludes.h"
 
 #include "cmPropertyMap.h"
 #include "cmState.h"
 
-#include <iosfwd>
-#include <map>
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-class cmake;
+class cmMarkAsAdvancedCommand;
 
 /** \class cmCacheManager
  * \brief Control class for cmake's cache

-----------------------------------------------------------------------

Summary of changes:
 Source/cmArchiveWrite.cxx            |    6 ------
 Source/cmArchiveWrite.h              |    7 +------
 Source/cmCLocaleEnvironmentScope.cxx |    1 -
 Source/cmCLocaleEnvironmentScope.h   |    5 +----
 Source/cmCacheManager.cxx            |    7 +++----
 Source/cmCacheManager.h              |   11 ++---------
 6 files changed, 7 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
CMake