diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-17 13:33:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-17 13:33:02 (GMT) |
| commit | 7d2a0aa76c25d92f1e2a03778f5666bdd7e56b92 (patch) | |
| tree | 2bdcf15abfef8e197173b5a135fe6b8391e43316 /Tests/Module/WriteCompilerDetectionHeader | |
| parent | 930ac45cbafca79eec9ae68e07c547b5c81b8c2c (diff) | |
| parent | d9fd2f5402eeaa345691313658e02b51038f570b (diff) | |
| download | CMake-7d2a0aa76c25d92f1e2a03778f5666bdd7e56b92.zip CMake-7d2a0aa76c25d92f1e2a03778f5666bdd7e56b92.tar.gz CMake-7d2a0aa76c25d92f1e2a03778f5666bdd7e56b92.tar.bz2 | |
Merge topic 'clang-format-source'
d9fd2f54 Revise C++ coding style using clang-format
82df6dea Empty commit at end of history preceding clang-format style transition
6a13f43f CONTRIBUTING: Add a section on coding style
bf451d9f Add a script to run clang-format on the entire source tree
1e90d78f Configure clang-format for CMake source tree
da60adc3 Tell Git to use a distinct conflict marker size in `.rst` files
Diffstat (limited to 'Tests/Module/WriteCompilerDetectionHeader')
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/compile_tests.h | 6 | ||||
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/main.c | 19 | ||||
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/main_multi.c | 19 |
3 files changed, 24 insertions, 20 deletions
diff --git a/Tests/Module/WriteCompilerDetectionHeader/compile_tests.h b/Tests/Module/WriteCompilerDetectionHeader/compile_tests.h index 8b547d8..d3c2a2d 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/compile_tests.h +++ b/Tests/Module/WriteCompilerDetectionHeader/compile_tests.h @@ -1,8 +1,10 @@ -#define JOIN_IMPL(A, B) A ## B +#define JOIN_IMPL(A, B) A##B #define JOIN(A, B) JOIN_IMPL(A, B) -#define CHECK(FEATURE) (JOIN(PREFIX, JOIN(_COMPILER_, FEATURE)) == JOIN(EXPECTED_COMPILER_, FEATURE)) +#define CHECK(FEATURE) \ + (JOIN(PREFIX, JOIN(_COMPILER_, FEATURE)) == \ + JOIN(EXPECTED_COMPILER_, FEATURE)) #if !CHECK(CXX_DELEGATING_CONSTRUCTORS) #error cxx_delegating_constructors expected availability did not match. diff --git a/Tests/Module/WriteCompilerDetectionHeader/main.c b/Tests/Module/WriteCompilerDetectionHeader/main.c index 9023b0f..ee6abdb 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/main.c +++ b/Tests/Module/WriteCompilerDetectionHeader/main.c @@ -1,22 +1,23 @@ #include "test_compiler_detection.h" -#if !defined(TEST_COMPILER_C_FUNCTION_PROTOTYPES) || !TEST_COMPILER_C_FUNCTION_PROTOTYPES -# error Expected TEST_COMPILER_C_FUNCTION_PROTOTYPES +#if !defined(TEST_COMPILER_C_FUNCTION_PROTOTYPES) || \ + !TEST_COMPILER_C_FUNCTION_PROTOTYPES +#error Expected TEST_COMPILER_C_FUNCTION_PROTOTYPES #endif #if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES -# error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES +#error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES #endif #if !defined(TEST_COMPILER_C_RESTRICT) || !TEST_COMPILER_C_RESTRICT -# if EXPECTED_COMPILER_C_RESTRICT -# error Expected TEST_COMPILER_C_RESTRICT -# endif +#if EXPECTED_COMPILER_C_RESTRICT +#error Expected TEST_COMPILER_C_RESTRICT +#endif #else -# if !EXPECTED_COMPILER_C_RESTRICT -# error Expect no TEST_COMPILER_C_RESTRICT -# endif +#if !EXPECTED_COMPILER_C_RESTRICT +#error Expect no TEST_COMPILER_C_RESTRICT +#endif #endif #ifdef TEST_COMPILER_CXX_STATIC_ASSERT diff --git a/Tests/Module/WriteCompilerDetectionHeader/main_multi.c b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c index 6f4573f..6e13fd7 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/main_multi.c +++ b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c @@ -1,22 +1,23 @@ #include "multi_file_compiler_detection.h" -#if !defined(MULTI_COMPILER_C_FUNCTION_PROTOTYPES) || !MULTI_COMPILER_C_FUNCTION_PROTOTYPES -# error Expected MULTI_COMPILER_C_FUNCTION_PROTOTYPES +#if !defined(MULTI_COMPILER_C_FUNCTION_PROTOTYPES) || \ + !MULTI_COMPILER_C_FUNCTION_PROTOTYPES +#error Expected MULTI_COMPILER_C_FUNCTION_PROTOTYPES #endif #if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES -# error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES +#error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES #endif #if !defined(MULTI_COMPILER_C_RESTRICT) || !MULTI_COMPILER_C_RESTRICT -# if EXPECTED_COMPILER_C_RESTRICT -# error Expected MULTI_COMPILER_C_RESTRICT -# endif +#if EXPECTED_COMPILER_C_RESTRICT +#error Expected MULTI_COMPILER_C_RESTRICT +#endif #else -# if !EXPECTED_COMPILER_C_RESTRICT -# error Expect no MULTI_COMPILER_C_RESTRICT -# endif +#if !EXPECTED_COMPILER_C_RESTRICT +#error Expect no MULTI_COMPILER_C_RESTRICT +#endif #endif #ifdef MULTI_COMPILER_CXX_STATIC_ASSERT |