[Cmake-commits] CMake branch, next, updated. v2.8.3-1121-g5590c41

[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  5590c411f7086716a153bddcc881fdb0f1fa3ebc (commit)
       via  dbc79bd8c8d5b9ef078401064db9bb0554affbcf (commit)
      from  b1015e187ffa3d02384fedeab1a0a414e4255283 (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=5590c411f7086716a153bddcc881fdb0f1fa3ebc
commit 5590c411f7086716a153bddcc881fdb0f1fa3ebc
Merge: b1015e1 dbc79bd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 29 15:47:27 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 29 15:47:27 2010 -0500

    Merge topic 'compiler-id-literal-const' into next
    
    dbc79bd Fix constness in compiler id detection


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbc79bd8c8d5b9ef078401064db9bb0554affbcf
commit dbc79bd8c8d5b9ef078401064db9bb0554affbcf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 29 15:35:15 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 29 15:35:15 2010 -0500

    Fix constness in compiler id detection
    
    Since commit 70c2dc8a (Make compiler id detection more robust,
    2008-03-10) we store compiler identification strings in test binaries
    using the form
    
      char* info = "info";
    
    Use the const-correct
    
      char const* info = "info";
    
    form instead.  This allows the C++ compiler identification to work with
    "-Werror -Wall" or equivalent flags if the compiler would warn about
    const-to-non-const conversion.

diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index accda32..27fa341 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -85,7 +85,7 @@
    getting matched.  Store it in a pointer rather than an array
    because some compilers will just produce instructions to fill the
    array rather than assigning a pointer to a static array.  */
-char* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
+char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
 
 @CMAKE_C_COMPILER_ID_PLATFORM_CONTENT@
 
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 4a32823..af84ae8 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -76,7 +76,7 @@
    getting matched.  Store it in a pointer rather than an array
    because some compilers will just produce instructions to fill the
    array rather than assigning a pointer to a static array.  */
-char* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
+char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
 
 @CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@
 
diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in
index e20348a..718e289 100644
--- a/Modules/CMakePlatformId.h.in
+++ b/Modules/CMakePlatformId.h.in
@@ -109,6 +109,6 @@
    getting matched.  Store it in a pointer rather than an array
    because some compilers will just produce instructions to fill the
    array rather than assigning a pointer to a static array.  */
-char* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]";
-char* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]";
+char const* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]";
+char const* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]";
 

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

Summary of changes:
 Modules/CMakeCCompilerId.c.in     |    2 +-
 Modules/CMakeCXXCompilerId.cpp.in |    2 +-
 Modules/CMakePlatformId.h.in      |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake