[Cmake-commits] CMake branch, next, updated. v3.2.1-1700-g3ffca24

[Brad King]

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  3ffca24da3e8fd79759910b9dc16bbc247d91971 (commit)
       via  96bbcf580ce7a900d6555b011b789e5064b24dbb (commit)
      from  3eca0b0fe2b29fba1195a43dfd6d987f72e1b97e (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=3ffca24da3e8fd79759910b9dc16bbc247d91971
commit 3ffca24da3e8fd79759910b9dc16bbc247d91971
Merge: 3eca0b0 96bbcf5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 08:26:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 10 08:26:54 2015 -0400

    Merge topic 'c-locale-messages' into next
    
    96bbcf58 fixup! CTest: Fix locale used for VCS updates


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96bbcf580ce7a900d6555b011b789e5064b24dbb
commit 96bbcf580ce7a900d6555b011b789e5064b24dbb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 08:25:41 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 10 08:26:31 2015 -0400

    fixup! CTest: Fix locale used for VCS updates
    
    We must include cmStandardIncludes.h first in every translation
    unit so large file support macros are defined consistently on
    AIX.

diff --git a/Source/cmCLocaleEnvironmentScope.h b/Source/cmCLocaleEnvironmentScope.h
index 223aaae..b011741 100644
--- a/Source/cmCLocaleEnvironmentScope.h
+++ b/Source/cmCLocaleEnvironmentScope.h
@@ -13,8 +13,7 @@
 #ifndef cmCLocaleEnvironmentScope_h
 #define cmCLocaleEnvironmentScope_h
 
-#include <map>
-#include <string>
+#include "cmStandardIncludes.h"
 
 class cmCLocaleEnvironmentScope
 {

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

Summary of changes:
 Source/cmCLocaleEnvironmentScope.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake