[Cmake-commits] CMake branch, next, updated. v2.8.7-3110-gb2d476e
Brad King
brad.king at kitware.com
Wed Mar 7 17:14:55 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 b2d476e8d8dd3baea4d984a69e86bf409a43e042 (commit)
via 55c3634dca801723bc93782b57bfe70889de5f03 (commit)
from b7effdfa9c061facd605cd2af4db25fcdfa7f82b (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=b2d476e8d8dd3baea4d984a69e86bf409a43e042
commit b2d476e8d8dd3baea4d984a69e86bf409a43e042
Merge: b7effdf 55c3634
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 7 17:14:54 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 7 17:14:54 2012 -0500
Merge topic 'update-kwiml' into next
55c3634 Revert "KWIML: Make test_INT_format robust to #define-d intN_t types"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55c3634dca801723bc93782b57bfe70889de5f03
commit 55c3634dca801723bc93782b57bfe70889de5f03
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 7 17:13:44 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 7 17:13:44 2012 -0500
Revert "KWIML: Make test_INT_format robust to #define-d intN_t types"
The commit introduced errors like:
Error E2451 test_INT_format.h 190: Undefined symbol 'int8_t'
in function test_INT_format
so the change needs more investigation.
diff --git a/Utilities/KWIML/test/test_INT_format.h.in b/Utilities/KWIML/test/test_INT_format.h.in
index 7b2b781..72a62f2 100644
--- a/Utilities/KWIML/test/test_INT_format.h.in
+++ b/Utilities/KWIML/test/test_INT_format.h.in
@@ -18,12 +18,14 @@
# define LANG "C "
#endif
-#define VALUE(T, U) (T)((U)0xab << ((sizeof(T)-1)<<3))
+#define VALUE(T, U) \
+ (@KWIML at _INT_##T)((@KWIML at _INT_##U)0xab << \
+ ((sizeof(@KWIML at _INT_##T)-1)<<3)) \
-#define TEST_C_(C, V, PRI, T, U) \
+#define TEST_C(C, V, PRI, T, U) \
{ \
- T const x = VALUE(T, U); \
- T y = @KWIML at _INT_##C(V); \
+ @KWIML at _INT_##T const x = VALUE(T, U); \
+ @KWIML at _INT_##T y = @KWIML at _INT_##C(V); \
printf(LANG "@KWIML at _INT_" #C ":" \
" expression [%"@KWIML at _INT_PRI##PRI"]," \
" literal [%"@KWIML at _INT_PRI##PRI"]", x, y); \
@@ -38,9 +40,9 @@
} \
}
-#define TEST_PRI_(PRI, T, U, STR) \
+#define TEST_PRI(PRI, T, U, STR) \
{ \
- T const x = VALUE(T, U); \
+ @KWIML at _INT_##T const x = VALUE(T, U); \
char const* str = STR; \
sprintf(buf, "%"@KWIML at _INT_PRI##PRI, x); \
printf(LANG "@KWIML at _INT_PRI" #PRI ":" \
@@ -56,11 +58,11 @@
} \
}
-#define TEST_SCN_(SCN, T, U, STR) TEST_SCN2_(SCN, SCN, T, U, STR)
-#define TEST_SCN2_(PRI, SCN, T, U, STR) \
+#define TEST_SCN(SCN, T, U, STR) TEST_SCN2(SCN, SCN, T, U, STR)
+#define TEST_SCN2(PRI, SCN, T, U, STR) \
{ \
- T const x = VALUE(T, U); \
- T y; \
+ @KWIML at _INT_##T const x = VALUE(T, U); \
+ @KWIML at _INT_##T y; \
char const* str = STR; \
if(sscanf(str, "%"@KWIML at _INT_SCN##SCN, &y) != 1) \
{ \
@@ -80,24 +82,10 @@
} \
}
-#define TEST_(FMT, T, U, STR) TEST2_(FMT, FMT, T, U, STR)
-#define TEST2_(PRI, SCN, T, U, STR) \
- TEST_PRI_(PRI, T, U, STR) \
- TEST_SCN2_(PRI, SCN, T, U, STR)
-
-/* Concatenate T and U now to avoid expanding them. */
-#define TEST(FMT, T, U, STR) \
- TEST_(FMT, @KWIML at _INT_##T, @KWIML at _INT_##U, STR)
-#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, T, 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) \
- TEST_SCN_(SCN, @KWIML at _INT_##T, @KWIML at _INT_##U, STR)
-#define TEST_SCN2(PRI, SCN, T, U, STR) \
- TEST_SCN2_(PRI, SCN, @KWIML at _INT_##T, @KWIML at _INT_##U, STR)
+#define TEST(FMT, T, U, STR) TEST2(FMT, FMT, T, U, STR)
+#define TEST2(PRI, SCN, T, U, STR) \
+ TEST_PRI(PRI, T, U, STR) \
+ TEST_SCN2(PRI, SCN, T, U, STR)
static int test_INT_format(void)
{
-----------------------------------------------------------------------
Summary of changes:
Utilities/KWIML/test/test_INT_format.h.in | 44 ++++++++++------------------
1 files changed, 16 insertions(+), 28 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list