[Cmake-commits] CMake branch, next, updated. v2.8.7-3125-gaa9a241

Brad King brad.king at kitware.com
Thu Mar 8 15:19:16 EST 2012


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  aa9a2412888af4457bf330e4c1c72a24879630f2 (commit)
       via  729cde214ea354dee8d40205bd0357f2dcfc042b (commit)
      from  0127ecdc7de6d26e9c6d2ab09fa82c0d2365e5a1 (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=aa9a2412888af4457bf330e4c1c72a24879630f2
commit aa9a2412888af4457bf330e4c1c72a24879630f2
Merge: 0127ecd 729cde2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 8 15:19:15 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 8 15:19:15 2012 -0500

    Merge topic 'update-kwiml' into next
    
    729cde2 KWIML: Make test_INT_format robust to #define-d INT#_C


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=729cde214ea354dee8d40205bd0357f2dcfc042b
commit 729cde214ea354dee8d40205bd0357f2dcfc042b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 8 15:14:05 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 8 15:14:05 2012 -0500

    KWIML: Make test_INT_format robust to #define-d INT#_C
    
    Avoid expanding macros like INT64_C in TEST_C.

diff --git a/Utilities/KWIML/test/test_INT_format.h.in b/Utilities/KWIML/test/test_INT_format.h.in
index 4425f8f..feca446 100644
--- a/Utilities/KWIML/test/test_INT_format.h.in
+++ b/Utilities/KWIML/test/test_INT_format.h.in
@@ -23,7 +23,7 @@
 #define TEST_C_(C, V, PRI, T, U)                                        \
   {                                                                     \
   T const x = VALUE(T, U);                                              \
-  T y = @KWIML at _INT_##C(V);                                             \
+  T y = C(V);                                                           \
   printf(LANG "@KWIML at _INT_" #C ":"                                     \
          " expression [%"@KWIML at _INT_PRI##PRI"],"                       \
          " literal [%"@KWIML at _INT_PRI##PRI"]", x, y);                   \
@@ -91,7 +91,7 @@
 #define TEST2(PRI, SCN, T, U, STR) \
         TEST2_(PRI, SCN, @KWIML at _INT_##T, @KWIML at _INT_##U, STR)
 #define TEST_C(C, V, PRI, T, U) \
-        TEST_C_(C, V, PRI, @KWIML at _INT_##T, @KWIML at _INT_##U)
+        TEST_C_(@KWIML at _INT_##C, V, PRI, @KWIML at _INT_##T, @KWIML at _INT_##U)
 #define TEST_PRI(PRI, T, U, STR) \
         TEST_PRI_(PRI, @KWIML at _INT_##T, @KWIML at _INT_##U, STR)
 #define TEST_SCN(SCN, T, U, STR) \

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list