[Cmake-commits] CMake branch, next, updated. v2.8.7-3307-gf65e72c

[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  f65e72c9794f4649ce6e0abe9882aba02bbeb6ad (commit)
       via  86c4c93888ee275d601d31e90f2cd912e73ba46d (commit)
       via  10272e6403bb73466af04c63ed6a3b97a4f70a33 (commit)
      from  954a27c27832fda0e10826159c18ab08a3461346 (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=f65e72c9794f4649ce6e0abe9882aba02bbeb6ad
commit f65e72c9794f4649ce6e0abe9882aba02bbeb6ad
Merge: 954a27c 86c4c93
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 20 15:52:40 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 20 15:52:40 2012 -0400

    Merge topic 'update-KWIML' into next
    
    86c4c93 Merge branch 'upstream-kwiml' into update-KWIML
    10272e6 KWIML: Avoid conflict with C++11 user-defined literals


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86c4c93888ee275d601d31e90f2cd912e73ba46d
commit 86c4c93888ee275d601d31e90f2cd912e73ba46d
Merge: d69c2c5 10272e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 20 15:51:11 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 20 15:51:11 2012 -0400

    Merge branch 'upstream-kwiml' into update-KWIML


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10272e6403bb73466af04c63ed6a3b97a4f70a33
commit 10272e6403bb73466af04c63ed6a3b97a4f70a33
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 20 15:42:18 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 20 15:49:49 2012 -0400

    KWIML: Avoid conflict with C++11 user-defined literals
    
    Clang warns
    
     test/test_INT_format.h:28:26: warning: identifier after literal will
     be treated as a reserved user-defined literal suffix in C++11
     [-Wc++11-compat-reserved-user-defined-literal]
      " expression [%"KWIML_INT_PRI##PRI"],"
    
    because the KWIML_... part is an identifier lexically immediately
    following a string literal.  Add a space between the string literal
    and the identifier to avoid the C++11 user-defined literal syntax.

diff --git a/test/test_INT_format.h.in b/test/test_INT_format.h.in
index a8ea263..71b443d 100644
--- a/test/test_INT_format.h.in
+++ b/test/test_INT_format.h.in
@@ -25,8 +25,8 @@
   T const x = VALUE(T, U);                                              \
   T y = C(V);                                                           \
   printf(LANG #C ":"                                                    \
-         " expression [%"@KWIML at _INT_PRI##PRI"],"                       \
-         " literal [%"@KWIML at _INT_PRI##PRI"]", x, y);                   \
+         " expression [%" @KWIML at _INT_PRI##PRI "],"                     \
+         " literal [%" @KWIML at _INT_PRI##PRI "]", x, y);                 \
   if(x == y)                                                            \
     {                                                                   \
     printf(", PASSED\n");                                               \
@@ -42,7 +42,7 @@
   {                                                                     \
   T const x = VALUE(T, U);                                              \
   char const* str = STR;                                                \
-  sprintf(buf, "%"@KWIML at _INT_PRI##PRI, x);                             \
+  sprintf(buf, "%" @KWIML at _INT_PRI##PRI, x);                            \
   printf(LANG "@KWIML at _INT_PRI" #PRI ":"                                \
          " expected [%s], got [%s]", str, buf);                         \
   if(strcmp(str, buf) == 0)                                             \
@@ -62,13 +62,13 @@
   T const x = VALUE(T, U);                                              \
   T y;                                                                  \
   char const* str = STR;                                                \
-  if(sscanf(str, "%"@KWIML at _INT_SCN##SCN, &y) != 1)                     \
+  if(sscanf(str, "%" @KWIML at _INT_SCN##SCN, &y) != 1)                    \
     {                                                                   \
     y = 0;                                                              \
     }                                                                   \
   printf(LANG "@KWIML at _INT_SCN" #SCN ":"                                \
-         " expected [%"@KWIML at _INT_PRI##PRI"],"                         \
-         " got [%"@KWIML at _INT_PRI##PRI"]", x, y);                       \
+         " expected [%" @KWIML at _INT_PRI##PRI "],"                       \
+         " got [%" @KWIML at _INT_PRI##PRI "]", x, y);                     \
   if(x == y)                                                            \
     {                                                                   \
     printf(", PASSED\n");                                               \

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

Summary of changes:
 Utilities/KWIML/test/test_INT_format.h.in |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake