diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-21 17:27:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-21 17:27:30 (GMT) |
| commit | 5f5ce26cb73bffc9fd348d5f82dfa7931a36a528 (patch) | |
| tree | ae2b8f398cd7c8006309db7e20bb6c4c24e876e4 | |
| parent | f8a10245e311cc516973aca55778396bde76d438 (diff) | |
| parent | 86c4c93888ee275d601d31e90f2cd912e73ba46d (diff) | |
| download | CMake-5f5ce26cb73bffc9fd348d5f82dfa7931a36a528.zip CMake-5f5ce26cb73bffc9fd348d5f82dfa7931a36a528.tar.gz CMake-5f5ce26cb73bffc9fd348d5f82dfa7931a36a528.tar.bz2 | |
Merge topic 'update-KWIML'
86c4c93 Merge branch 'upstream-kwiml' into update-KWIML
10272e6 KWIML: Avoid conflict with C++11 user-defined literals
| -rw-r--r-- | Utilities/KWIML/test/test_INT_format.h.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Utilities/KWIML/test/test_INT_format.h.in b/Utilities/KWIML/test/test_INT_format.h.in index a8ea263..71b443d 100644 --- a/Utilities/KWIML/test/test_INT_format.h.in +++ b/Utilities/KWIML/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@_INT_PRI##PRI"]," \ - " literal [%"@KWIML@_INT_PRI##PRI"]", x, y); \ + " expression [%" @KWIML@_INT_PRI##PRI "]," \ + " literal [%" @KWIML@_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@_INT_PRI##PRI, x); \ + sprintf(buf, "%" @KWIML@_INT_PRI##PRI, x); \ printf(LANG "@KWIML@_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@_INT_SCN##SCN, &y) != 1) \ + if(sscanf(str, "%" @KWIML@_INT_SCN##SCN, &y) != 1) \ { \ y = 0; \ } \ printf(LANG "@KWIML@_INT_SCN" #SCN ":" \ - " expected [%"@KWIML@_INT_PRI##PRI"]," \ - " got [%"@KWIML@_INT_PRI##PRI"]", x, y); \ + " expected [%" @KWIML@_INT_PRI##PRI "]," \ + " got [%" @KWIML@_INT_PRI##PRI "]", x, y); \ if(x == y) \ { \ printf(", PASSED\n"); \ |