[Cmake-commits] CMake branch, next, updated. v2.8.6-2073-gb752048

Brad King brad.king at kitware.com
Wed Nov 30 09:29:31 EST 2011


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  b752048f5b03dfdd75c9a82bbdb588758937bbca (commit)
       via  ac2e45d0893dd283c04c600e626bf80ea57d4a71 (commit)
       via  28c46ca6cd6ffd344e83c79108bc5b54eb7d7428 (commit)
      from  45957128b9f0947f69e82ca35e58776a77de301d (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=b752048f5b03dfdd75c9a82bbdb588758937bbca
commit b752048f5b03dfdd75c9a82bbdb588758937bbca
Merge: 4595712 ac2e45d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 30 09:29:28 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 30 09:29:28 2011 -0500

    Merge topic 'newline-style' into next
    
    ac2e45d Provide std::ios_base typedef on GCC < 3
    28c46ca cmNewLineStyle: Use cmStandardIncludes.h


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac2e45d0893dd283c04c600e626bf80ea57d4a71
commit ac2e45d0893dd283c04c600e626bf80ea57d4a71
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 30 09:27:18 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 30 09:27:18 2011 -0500

    Provide std::ios_base typedef on GCC < 3
    
    The ancient GNU standard library provided std::ios but not
    std::ios_base.  Define the latter in terms of the former.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index e8decbb..ea299ca 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -161,6 +161,11 @@ extern int putenv (char *__string) __THROW;
 #define for if(false) {} else for
 #endif
 
+// Provide std::ios_base on ancient GCC 2.9x
+#if defined(__GNUC__) && __GNUC__ < 3
+namespace std { typedef ios ios_base; }
+#endif
+
 // check for the 720 compiler on the SGI
 // which has some strange properties that I don't think are worth
 // checking for in a general way in configure

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28c46ca6cd6ffd344e83c79108bc5b54eb7d7428
commit 28c46ca6cd6ffd344e83c79108bc5b54eb7d7428
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 30 09:19:32 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 30 09:19:32 2011 -0500

    cmNewLineStyle: Use cmStandardIncludes.h
    
    This ensures that stl types are compiled consistently with
    the reset of CMake.  Otherwise one may get errors like
    
      Undefined symbol: .cmNewLineStyle::ReadFromArguments(
        const std::vector<std::_LFS_ON::basic_string ...)
    
    due to inconsistent large file support definitions.

diff --git a/Source/cmNewLineStyle.h b/Source/cmNewLineStyle.h
index 9d4c03b..cae1106 100644
--- a/Source/cmNewLineStyle.h
+++ b/Source/cmNewLineStyle.h
@@ -12,9 +12,7 @@
 #ifndef cmNewLineStyle_h
 #define cmNewLineStyle_h
 
-#include <string>
-#include <vector>
-
+#include "cmStandardIncludes.h"
 
 class cmNewLineStyle
 {

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

Summary of changes:
 Source/cmNewLineStyle.h     |    4 +---
 Source/cmStandardIncludes.h |    5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list