diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2018-06-01 09:53:41 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-01 09:53:42 -0400 |
| commit | d7204e649ed4ebb19bb341b4e49eb51514364922 (patch) | |
| tree | d9ac3ded5ae6899be7188795011743fe3e6da0a6 /Tests | |
| parent | 12fed3edb107c949671043196fa94c542b45452a (diff) | |
| download | cmake-d7204e649ed4ebb19bb341b4e49eb51514364922.tar.gz | |
Revise C++ coding style using clang-format-6.0
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`. Use `clang-format` version 6.0.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Tests')
214 files changed, 1182 insertions, 1126 deletions
diff --git a/Tests/AliasTarget/bat.cpp b/Tests/AliasTarget/bat.cpp index cb76bfe2f6..14942bf1c6 100644 --- a/Tests/AliasTarget/bat.cpp +++ b/Tests/AliasTarget/bat.cpp @@ -1,22 +1,22 @@ #ifndef FOO_DEFINE -#error Expected FOO_DEFINE +# error Expected FOO_DEFINE #endif #ifndef BAR_DEFINE -#error Expected Bar_DEFINE +# error Expected Bar_DEFINE #endif #include "commandoutput.h" #ifndef COMMANDOUTPUT_DEFINE -#error Expected COMMANDOUTPUT_DEFINE +# error Expected COMMANDOUTPUT_DEFINE #endif #include "targetoutput.h" #ifndef TARGETOUTPUT_DEFINE -#error Expected TARGETOUTPUT_DEFINE +# error Expected TARGETOUTPUT_DEFINE #endif #ifdef _WIN32 diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx index 9ae802f5bb..2e4325cf91 100644 --- a/Tests/BundleTest/BundleLib.cxx +++ b/Tests/BundleTest/BundleLib.cxx @@ -8,7 +8,7 @@ int fileExists(char* filename) { #ifndef R_OK -#define R_OK 04 +# define R_OK 04 #endif if (access(filename, R_OK) != 0) { printf("Cannot find file: %s\n", filename); diff --git a/Tests/BundleUtilities/framework.h b/Tests/BundleUtilities/framework.h index 343317c598..5a3cfc4575 100644 --- a/Tests/BundleUtilities/framework.h +++ b/Tests/BundleUtilities/framework.h @@ -3,13 +3,13 @@ #define framework_h #ifdef WIN32 -#ifdef framework_EXPORTS -#define FRAMEWORK_EXPORT __declspec(dllexport) +# ifdef framework_EXPORTS +# define FRAMEWORK_EXPORT __declspec(dllexport) +# else +# define FRAMEWORK_EXPORT __declspec(dllimport) +# endif #else -#define FRAMEWORK_EXPORT __declspec(dllimport) -#endif -#else -#define FRAMEWORK_EXPORT +# define FRAMEWORK_EXPORT #endif void FRAMEWORK_EXPORT framework(); diff --git a/Tests/BundleUtilities/shared.h b/Tests/BundleUtilities/shared.h index 28904fd78d..5d5b6335c4 100644 --- a/Tests/BundleUtilities/shared.h +++ b/Tests/BundleUtilities/shared.h @@ -3,13 +3,13 @@ #define shared_h #ifdef WIN32 -#ifdef shared_EXPORTS -#define SHARED_EXPORT __declspec(dllexport) +# ifdef shared_EXPORTS +# define SHARED_EXPORT __declspec(dllexport) +# else +# define SHARED_EXPORT __declspec(dllimport) +# endif #else -#define SHARED_EXPORT __declspec(dllimport) -#endif -#else -#define SHARED_EXPORT +# define SHARED_EXPORT #endif void SHARED_EXPORT shared(); diff --git a/Tests/BundleUtilities/shared2.h b/Tests/BundleUtilities/shared2.h index 3f0015c803..3f016c8f0d 100644 --- a/Tests/BundleUtilities/shared2.h +++ b/Tests/BundleUtilities/shared2.h @@ -3,13 +3,13 @@ #define shared2_h #ifdef WIN32 -#ifdef shared2_EXPORTS -#define SHARED2_EXPORT __declspec(dllexport) +# ifdef shared2_EXPORTS +# define SHARED2_EXPORT __declspec(dllexport) +# else +# define SHARED2_EXPORT __declspec(dllimport) +# endif #else -#define SHARED2_EXPORT __declspec(dllimport) -#endif -#else -#define SHARED2_EXPORT +# define SHARED2_EXPORT #endif void SHARED2_EXPORT shared2(); diff --git a/Tests/BundleUtilities/testbundleutils1.cpp b/Tests/BundleUtilities/testbundleutils1.cpp index 3eb6a44bfa..080157ac22 100644 --- a/Tests/BundleUtilities/testbundleutils1.cpp +++ b/Tests/BundleUtilities/testbundleutils1.cpp @@ -4,9 +4,9 @@ #include "stdio.h" #if defined(WIN32) -#include <windows.h> +# include <windows.h> #else -#include "dlfcn.h" +# include "dlfcn.h" #endif int main(int, char**) diff --git a/Tests/BundleUtilities/testbundleutils2.cpp b/Tests/BundleUtilities/testbundleutils2.cpp index c39eb52c57..e747544db2 100644 --- a/Tests/BundleUtilities/testbundleutils2.cpp +++ b/Tests/BundleUtilities/testbundleutils2.cpp @@ -4,9 +4,9 @@ #include "stdio.h" #if defined(WIN32) -#include <windows.h> +# include <windows.h> #else -#include "dlfcn.h" +# include "dlfcn.h" #endif int main(int, char**) diff --git a/Tests/BundleUtilities/testbundleutils3.cpp b/Tests/BundleUtilities/testbundleutils3.cpp index 3bc8a83ecf..2dee46fe58 100644 --- a/Tests/BundleUtilities/testbundleutils3.cpp +++ b/Tests/BundleUtilities/testbundleutils3.cpp @@ -4,9 +4,9 @@ #include "stdio.h" #if defined(WIN32) -#include <windows.h> +# include <windows.h> #else -#include "dlfcn.h" +# include "dlfcn.h" #endif int main(int, char**) diff --git a/Tests/CMakeCommands/add_compile_definitions/main.cpp b/Tests/CMakeCommands/add_compile_definitions/main.cpp index b3829225fe..41ff25f4c1 100644 --- a/Tests/CMakeCommands/add_compile_definitions/main.cpp +++ b/Tests/CMakeCommands/add_compile_definitions/main.cpp @@ -1,14 +1,14 @@ #ifndef TEST_DEFINITION -#error Expected TEST_DEFINITION +# error Expected TEST_DEFINITION #endif #ifndef LANG_CXX -#error Expected LANG_CXX +# error Expected LANG_CXX #endif #ifdef UNPEXTED_DEFINITION -#error Unexpected UNPEXTED_DEFINITION +# error Unexpected UNPEXTED_DEFINITION #endif int main(void) diff --git a/Tests/CMakeCommands/add_compile_options/main.cpp b/Tests/CMakeCommands/add_compile_options/main.cpp index 1d5702165c..53f54b7711 100644 --- a/Tests/CMakeCommands/add_compile_options/main.cpp +++ b/Tests/CMakeCommands/add_compile_options/main.cpp @@ -1,8 +1,8 @@ #ifdef DO_GNU_TESTS -#ifndef TEST_OPTION -#error Expected TEST_OPTION -#endif +# ifndef TEST_OPTION +# error Expected TEST_OPTION +# endif #endif int main(void) diff --git a/Tests/CMakeCommands/target_compile_definitions/consumer.c b/Tests/CMakeCommands/target_compile_definitions/consumer.c index e134a8b40c..bacd4c4024 100644 --- a/Tests/CMakeCommands/target_compile_definitions/consumer.c +++ b/Tests/CMakeCommands/target_compile_definitions/consumer.c @@ -2,37 +2,37 @@ // Visual Studio allows only one set of flags for C and C++. // In a target using C++ we pick the C++ flags even for C sources. #ifdef TEST_LANG_DEFINES_FOR_VISUAL_STUDIO_OR_XCODE -#ifndef CONSUMER_LANG_CXX -#error Expected CONSUMER_LANG_CXX -#endif +# ifndef CONSUMER_LANG_CXX +# error Expected CONSUMER_LANG_CXX +# endif -#ifdef CONSUMER_LANG_C -#error Unexpected CONSUMER_LANG_C -#endif +# ifdef CONSUMER_LANG_C +# error Unexpected CONSUMER_LANG_C +# endif -#if !LANG_IS_CXX -#error Expected LANG_IS_CXX -#endif +# if !LANG_IS_CXX +# error Expected LANG_IS_CXX +# endif -#if LANG_IS_C -#error Unexpected LANG_IS_C -#endif +# if LANG_IS_C +# error Unexpected LANG_IS_C +# endif #else -#ifdef CONSUMER_LANG_CXX -#error Unexpected CONSUMER_LANG_CXX -#endif +# ifdef CONSUMER_LANG_CXX +# error Unexpected CONSUMER_LANG_CXX +# endif -#ifndef CONSUMER_LANG_C -#error Expected CONSUMER_LANG_C -#endif +# ifndef CONSUMER_LANG_C +# error Expected CONSUMER_LANG_C +# endif -#if !LANG_IS_C -#error Expected LANG_IS_C -#endif +# if !LANG_IS_C +# error Expected LANG_IS_C +# endif -#if LANG_IS_CXX -#error Unexpected LANG_IS_CXX -#endif +# if LANG_IS_CXX +# error Unexpected LANG_IS_CXX +# endif #endif void consumer_c() diff --git a/Tests/CMakeCommands/target_compile_definitions/consumer.cpp b/Tests/CMakeCommands/target_compile_definitions/consumer.cpp index 69ea15112d..099952666c 100644 --- a/Tests/CMakeCommands/target_compile_definitions/consumer.cpp +++ b/Tests/CMakeCommands/target_compile_definitions/consumer.cpp @@ -1,34 +1,34 @@ #ifdef MY_PRIVATE_DEFINE -#error Unexpected MY_PRIVATE_DEFINE +# error Unexpected MY_PRIVATE_DEFINE #endif #ifndef MY_PUBLIC_DEFINE -#error Expected MY_PUBLIC_DEFINE +# error Expected MY_PUBLIC_DEFINE #endif #ifndef MY_INTERFACE_DEFINE -#error Expected MY_INTERFACE_DEFINE +# error Expected MY_INTERFACE_DEFINE #endif #ifndef DASH_D_DEFINE -#error Expected DASH_D_DEFINE +# error Expected DASH_D_DEFINE #endif #ifndef CONSUMER_LANG_CXX -#error Expected CONSUMER_LANG_CXX +# error Expected CONSUMER_LANG_CXX #endif #ifdef CONSUMER_LANG_C -#error Unexpected CONSUMER_LANG_C +# error Unexpected CONSUMER_LANG_C #endif #if !LANG_IS_CXX -#error Expected LANG_IS_CXX +# error Expected LANG_IS_CXX #endif #if LANG_IS_C -#error Unexpected LANG_IS_C +# error Unexpected LANG_IS_C #endif int main() diff --git a/Tests/CMakeCommands/target_compile_definitions/main.cpp b/Tests/CMakeCommands/target_compile_definitions/main.cpp index bf08b45e36..3f64dc843e 100644 --- a/Tests/CMakeCommands/target_compile_definitions/main.cpp +++ b/Tests/CMakeCommands/target_compile_definitions/main.cpp @@ -1,14 +1,14 @@ #ifndef MY_PRIVATE_DEFINE -#error Expected MY_PRIVATE_DEFINE +# error Expected MY_PRIVATE_DEFINE #endif #ifndef MY_PUBLIC_DEFINE -#error Expected MY_PUBLIC_DEFINE +# error Expected MY_PUBLIC_DEFINE #endif #ifdef MY_INTERFACE_DEFINE -#error Unexpected MY_INTERFACE_DEFINE +# error Unexpected MY_INTERFACE_DEFINE #endif int main() diff --git a/Tests/CMakeCommands/target_compile_options/consumer.c b/Tests/CMakeCommands/target_compile_options/consumer.c index 420b4cc878..f9b66543a6 100644 --- a/Tests/CMakeCommands/target_compile_options/consumer.c +++ b/Tests/CMakeCommands/target_compile_options/consumer.c @@ -2,37 +2,37 @@ // Visual Studio allows only one set of flags for C and C++. // In a target using C++ we pick the C++ flags even for C sources. #ifdef TEST_LANG_DEFINES_FOR_VISUAL_STUDIO -#ifndef CONSUMER_LANG_CXX -#error Expected CONSUMER_LANG_CXX -#endif +# ifndef CONSUMER_LANG_CXX +# error Expected CONSUMER_LANG_CXX +# endif -#ifdef CONSUMER_LANG_C -#error Unexpected CONSUMER_LANG_C -#endif +# ifdef CONSUMER_LANG_C +# error Unexpected CONSUMER_LANG_C +# endif -#if !LANG_IS_CXX -#error Expected LANG_IS_CXX -#endif +# if !LANG_IS_CXX +# error Expected LANG_IS_CXX +# endif -#if LANG_IS_C -#error Unexpected LANG_IS_C -#endif +# if LANG_IS_C +# error Unexpected LANG_IS_C +# endif #else -#ifdef CONSUMER_LANG_CXX -#error Unexpected CONSUMER_LANG_CXX -#endif +# ifdef CONSUMER_LANG_CXX +# error Unexpected CONSUMER_LANG_CXX +# endif -#ifndef CONSUMER_LANG_C -#error Expected CONSUMER_LANG_C -#endif +# ifndef CONSUMER_LANG_C +# error Expected CONSUMER_LANG_C +# endif -#if !LANG_IS_C -#error Expected LANG_IS_C -#endif +# if !LANG_IS_C +# error Expected LANG_IS_C +# endif -#if LANG_IS_CXX -#error Unexpected LANG_IS_CXX -#endif +# if LANG_IS_CXX +# error Unexpected LANG_IS_CXX +# endif #endif void consumer_c() diff --git a/Tests/CMakeCommands/target_compile_options/consumer.cpp b/Tests/CMakeCommands/target_compile_options/consumer.cpp index 7750950a12..fe79eb5515 100644 --- a/Tests/CMakeCommands/target_compile_options/consumer.cpp +++ b/Tests/CMakeCommands/target_compile_options/consumer.cpp @@ -1,34 +1,34 @@ #ifdef DO_GNU_TESTS -#ifdef MY_PRIVATE_DEFINE -#error Unexpected MY_PRIVATE_DEFINE -#endif +# ifdef MY_PRIVATE_DEFINE +# error Unexpected MY_PRIVATE_DEFINE +# endif -#ifndef MY_PUBLIC_DEFINE -#error Expected MY_PUBLIC_DEFINE -#endif +# ifndef MY_PUBLIC_DEFINE +# error Expected MY_PUBLIC_DEFINE +# endif -#ifndef MY_INTERFACE_DEFINE -#error Expected MY_INTERFACE_DEFINE -#endif +# ifndef MY_INTERFACE_DEFINE +# error Expected MY_INTERFACE_DEFINE +# endif #endif #ifndef CONSUMER_LANG_CXX -#error Expected CONSUMER_LANG_CXX +# error Expected CONSUMER_LANG_CXX #endif #ifdef CONSUMER_LANG_C -#error Unexpected CONSUMER_LANG_C +# error Unexpected CONSUMER_LANG_C #endif #if !LANG_IS_CXX -#error Expected LANG_IS_CXX +# error Expected LANG_IS_CXX #endif #if LANG_IS_C -#error Unexpected LANG_IS_C +# error Unexpected LANG_IS_C #endif int main() diff --git a/Tests/CMakeCommands/target_compile_options/main.cpp b/Tests/CMakeCommands/target_compile_options/main.cpp index ac472aedad..829a25e73b 100644 --- a/Tests/CMakeCommands/target_compile_options/main.cpp +++ b/Tests/CMakeCommands/target_compile_options/main.cpp @@ -1,17 +1,17 @@ #ifdef DO_GNU_TESTS -#ifndef MY_PRIVATE_DEFINE -#error Expected MY_PRIVATE_DEFINE -#endif +# ifndef MY_PRIVATE_DEFINE +# error Expected MY_PRIVATE_DEFINE +# endif -#ifndef MY_PUBLIC_DEFINE -#error Expected MY_PUBLIC_DEFINE -#endif +# ifndef MY_PUBLIC_DEFINE +# error Expected MY_PUBLIC_DEFINE +# endif -#ifdef MY_INTERFACE_DEFINE -#error Unexpected MY_INTERFACE_DEFINE -#endif +# ifdef MY_INTERFACE_DEFINE +# error Unexpected MY_INTERFACE_DEFINE +# endif #endif diff --git a/Tests/CMakeCommands/target_include_directories/consumer.c b/Tests/CMakeCommands/target_include_directories/consumer.c index 419c2d23db..7fd694b089 100644 --- a/Tests/CMakeCommands/target_include_directories/consumer.c +++ b/Tests/CMakeCommands/target_include_directories/consumer.c @@ -2,17 +2,17 @@ // Visual Studio allows only one set of flags for C and C++. // In a target using C++ we pick the C++ flags even for C sources. #ifdef TEST_LANG_DEFINES_FOR_VISUAL_STUDIO_OR_XCODE -#include "cxx_only.h" +# include "cxx_only.h" -#ifndef CXX_ONLY_DEFINE -#error Expected CXX_ONLY_DEFINE -#endif +# ifndef CXX_ONLY_DEFINE +# error Expected CXX_ONLY_DEFINE +# endif #else -#include "c_only.h" +# include "c_only.h" -#ifndef C_ONLY_DEFINE -#error Expected C_ONLY_DEFINE -#endif +# ifndef C_ONLY_DEFINE +# error Expected C_ONLY_DEFINE +# endif #endif int consumer_c() diff --git a/Tests/CMakeCommands/target_include_directories/consumer.cpp b/Tests/CMakeCommands/target_include_directories/consumer.cpp index 1e018ad13a..267b0a342c 100644 --- a/Tests/CMakeCommands/target_include_directories/consumer.cpp +++ b/Tests/CMakeCommands/target_include_directories/consumer.cpp @@ -7,31 +7,31 @@ #include "relative_dir.h" #ifdef PRIVATEINCLUDE_DEFINE -#error Unexpected PRIVATEINCLUDE_DEFINE +# error Unexpected PRIVATEINCLUDE_DEFINE #endif #ifndef PUBLICINCLUDE_DEFINE -#error Expected PUBLICINCLUDE_DEFINE +# error Expected PUBLICINCLUDE_DEFINE #endif #ifndef INTERFACEINCLUDE_DEFINE -#error Expected INTERFACEINCLUDE_DEFINE +# error Expected INTERFACEINCLUDE_DEFINE #endif #ifndef CURE_DEFINE -#error Expected CURE_DEFINE +# error Expected CURE_DEFINE #endif #ifndef RELATIVE_DIR_DEFINE -#error Expected RELATIVE_DIR_DEFINE +# error Expected RELATIVE_DIR_DEFINE #endif #ifndef CONSUMER_DEFINE -#error Expected CONSUMER_DEFINE +# error Expected CONSUMER_DEFINE #endif #ifndef CXX_ONLY_DEFINE -#error Expected CXX_ONLY_DEFINE +# error Expected CXX_ONLY_DEFINE #endif int main() diff --git a/Tests/CMakeCommands/target_include_directories/main.cpp b/Tests/CMakeCommands/target_include_directories/main.cpp index 71298ceacd..dd591bfedc 100644 --- a/Tests/CMakeCommands/target_include_directories/main.cpp +++ b/Tests/CMakeCommands/target_include_directories/main.cpp @@ -4,19 +4,19 @@ #include "publicinclude.h" #ifndef PRIVATEINCLUDE_DEFINE -#error Expected PRIVATEINCLUDE_DEFINE +# error Expected PRIVATEINCLUDE_DEFINE #endif #ifndef PUBLICINCLUDE_DEFINE -#error Expected PUBLICINCLUDE_DEFINE +# error Expected PUBLICINCLUDE_DEFINE #endif #ifdef INTERFACEINCLUDE_DEFINE -#error Unexpected INTERFACEINCLUDE_DEFINE +# error Unexpected INTERFACEINCLUDE_DEFINE #endif #ifndef CURE_DEFINE -#error Expected CURE_DEFINE +# error Expected CURE_DEFINE #endif int main() diff --git a/Tests/CMakeCommands/target_link_libraries/libgenex.h b/Tests/CMakeCommands/target_link_libraries/libgenex.h index 733f9b6df2..59ac18a336 100644 --- a/Tests/CMakeCommands/target_link_libraries/libgenex.h +++ b/Tests/CMakeCommands/target_link_libraries/libgenex.h @@ -2,7 +2,7 @@ #include "libgenex_export.h" #ifndef LIBGENEX_H -#define LIBGENEX_H +# define LIBGENEX_H struct LIBGENEX_EXPORT LibGenex { diff --git a/Tests/CMakeCommands/target_link_libraries/targetC.cpp b/Tests/CMakeCommands/target_link_libraries/targetC.cpp index 7c5c9e4268..cae02b9cd2 100644 --- a/Tests/CMakeCommands/target_link_libraries/targetC.cpp +++ b/Tests/CMakeCommands/target_link_libraries/targetC.cpp @@ -5,7 +5,7 @@ #include "foo.h" #ifndef TEST_DEF -#error Expected TEST_DEF definition +# error Expected TEST_DEF definition #endif int main(int, char**) diff --git a/Tests/CMakeLib/testEncoding.cxx b/Tests/CMakeLib/testEncoding.cxx index 11f64098e7..d608e86d75 100644 --- a/Tests/CMakeLib/testEncoding.cxx +++ b/Tests/CMakeLib/testEncoding.cxx @@ -3,7 +3,7 @@ #include <string> #ifdef _WIN32 -#include "cmsys/ConsoleBuf.hxx" +# include "cmsys/ConsoleBuf.hxx" #endif #ifdef _WIN32 diff --git a/Tests/CMakeLib/testUVRAII.cxx b/Tests/CMakeLib/testUVRAII.cxx index 44def25278..e165ff7c0b 100644 --- a/Tests/CMakeLib/testUVRAII.cxx +++ b/Tests/CMakeLib/testUVRAII.cxx @@ -30,7 +30,8 @@ static bool testAsyncShutdown() std::thread([&] { std::this_thread::sleep_for(std::chrono::seconds(2)); signal.send(); - }).detach(); + }) + .detach(); if (uv_run(&Loop, UV_RUN_DEFAULT) != 0) { std::cerr << "Unclean exit state in testAsyncDtor" << std::endl; diff --git a/Tests/CMakeLib/testVisualStudioSlnParser.cxx b/Tests/CMakeLib/testVisualStudioSlnParser.cxx index f8bcfae856..c7fd585cc0 100644 --- a/Tests/CMakeLib/testVisualStudioSlnParser.cxx +++ b/Tests/CMakeLib/testVisualStudioSlnParser.cxx @@ -45,17 +45,55 @@ int testVisualStudioSlnParser(int, char* []) } const std::vector<cmSlnProjectEntry>& projects = data.GetProjects(); const char* const names[] = { - "3rdParty", "ALL_BUILD", "CMakeLib", "CMakeLibTests", - "CMakePredefinedTargets", "CPackLib", "CTestDashboardTargets", - "CTestLib", "Continuous", "Documentation", "Experimental", "INSTALL", - "KWSys", "LIBCURL", "Nightly", "NightlyMemoryCheck", "PACKAGE", - "RUN_TESTS", "Tests", "Utilities", "Win9xCompat", "ZERO_CHECK", - "cmIML_test", "cmake", "cmbzip2", "cmcldeps", "cmcompress", "cmcurl", - "cmexpat", "cmlibarchive", "cmsys", "cmsysEncodeExecutable", - "cmsysProcessFwd9x", "cmsysTestDynload", "cmsysTestProcess", - "cmsysTestSharedForward", "cmsysTestsC", "cmsysTestsCxx", "cmsys_c", - "cmw9xcom", "cmzlib", "cpack", "ctest", "documentation", "memcheck_fail", - "pseudo_BC", "pseudo_purify", "pseudo_valgrind", "test_clean", + "3rdParty", + "ALL_BUILD", + "CMakeLib", + "CMakeLibTests", + "CMakePredefinedTargets", + "CPackLib", + "CTestDashboardTargets", + "CTestLib", + "Continuous", + "Documentation", + "Experimental", + "INSTALL", + "KWSys", + "LIBCURL", + "Nightly", + "NightlyMemoryCheck", + "PACKAGE", + "RUN_TESTS", + "Tests", + "Utilities", + "Win9xCompat", + "ZERO_CHECK", + "cmIML_test", + "cmake", + "cmbzip2", + "cmcldeps", + "cmcompress", + "cmcurl", + "cmexpat", + "cmlibarchive", + "cmsys", + "cmsysEncodeExecutable", + "cmsysProcessFwd9x", + "cmsysTestDynload", + "cmsysTestProcess", + "cmsysTestSharedForward", + "cmsysTestsC", + "cmsysTestsCxx", + "cmsys_c", + "cmw9xcom", + "cmzlib", + "cpack", + "ctest", + "documentation", + "memcheck_fail", + "pseudo_BC", + "pseudo_purify", + "pseudo_valgrind", + "test_clean", "uninstall" /* clang-format needs this comment to break after the opening brace */ }; diff --git a/Tests/COnly/libc2.h b/Tests/COnly/libc2.h index 7bc4fb1c89..43ebce9148 100644 --- a/Tests/COnly/libc2.h +++ b/Tests/COnly/libc2.h @@ -1,11 +1,11 @@ #ifdef _WIN32 -#ifdef testc2_EXPORTS -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# ifdef testc2_EXPORTS +# define CM_TEST_LIB_EXPORT __declspec(dllexport) +# else +# define CM_TEST_LIB_EXPORT __declspec(dllimport) +# endif #else -#define CM_TEST_LIB_EXPORT __declspec(dllimport) -#endif -#else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float LibC2Func(); diff --git a/Tests/COnly/testCModule.c b/Tests/COnly/testCModule.c index 4381bd746e..edeb2b1fd6 100644 --- a/Tests/COnly/testCModule.c +++ b/Tests/COnly/testCModule.c @@ -1,7 +1,7 @@ #ifdef _WIN32 -#define TEST_EXPORT __declspec(dllexport) +# define TEST_EXPORT __declspec(dllexport) #else -#define TEST_EXPORT +# define TEST_EXPORT #endif TEST_EXPORT int testCModule(void) { diff --git a/Tests/CTestTestCostSerial/sleep.c b/Tests/CTestTestCostSerial/sleep.c index b7abe946b0..8a174c9b80 100644 --- a/Tests/CTestTestCostSerial/sleep.c +++ b/Tests/CTestTestCostSerial/sleep.c @@ -1,7 +1,7 @@ #if defined(_WIN32) -#include <windows.h> +# include <windows.h> #else -#include <unistd.h> +# include <unistd.h> #endif /* sleeps for 1 second */ diff --git a/Tests/CTestTestFdSetSize/sleep.c b/Tests/CTestTestFdSetSize/sleep.c index 6676488fbb..2fb6490aa9 100644 --- a/Tests/CTestTestFdSetSize/sleep.c +++ b/Tests/CTestTestFdSetSize/sleep.c @@ -1,7 +1,7 @@ #if defined(_WIN32) -#include <windows.h> +# include <windows.h> #else -#include <unistd.h> +# include <unistd.h> #endif /* sleeps for 0.1 second */ diff --git a/Tests/CTestTestScheduler/sleep.c b/Tests/CTestTestScheduler/sleep.c index 41a5d450b2..327bff57e1 100644 --- a/Tests/CTestTestScheduler/sleep.c +++ b/Tests/CTestTestScheduler/sleep.c @@ -1,7 +1,7 @@ #if defined(_WIN32) -#include <windows.h> +# include <windows.h> #else -#include <unistd.h> +# include <unistd.h> #endif /* sleeps for 4n seconds, where n is the argument to the program */ diff --git a/Tests/CTestTestStopTime/sleep.c b/Tests/CTestTestStopTime/sleep.c index 3baad9ea07..b9b6e897bc 100644 --- a/Tests/CTestTestStopTime/sleep.c +++ b/Tests/CTestTestStopTime/sleep.c @@ -1,7 +1,7 @@ #if defined(_WIN32) -#include <windows.h> +# include <windows.h> #else -#include <unistd.h> +# include <unistd.h> #endif /* sleeps for n seconds, where n is the argument to the program */ diff --git a/Tests/CTestTestTimeout/sleep.c b/Tests/CTestTestTimeout/sleep.c index a4872b52e2..ebe127430d 100644 --- a/Tests/CTestTestTimeout/sleep.c +++ b/Tests/CTestTestTimeout/sleep.c @@ -1,7 +1,7 @@ #if defined(_WIN32) -#include <windows.h> +# include <windows.h> #else -#include <unistd.h> +# include <unistd.h> #endif #include <stdio.h> diff --git a/Tests/CTestTestUpload/sleep.c b/Tests/CTestTestUpload/sleep.c index 3baad9ea07..b9b6e897bc 100644 --- a/Tests/CTestTestUpload/sleep.c +++ b/Tests/CTestTestUpload/sleep.c @@ -1,7 +1,7 @@ #if defined(_WIN32) -#include <windows.h> +# include <windows.h> #else -#include <unistd.h> +# include <unistd.h> #endif /* sleeps for n seconds, where n is the argument to the program */ diff --git a/Tests/CTestTestZeroTimeout/sleep.c b/Tests/CTestTestZeroTimeout/sleep.c index 0be7bbc4f0..5d0b89bf7d 100644 --- a/Tests/CTestTestZeroTimeout/sleep.c +++ b/Tests/CTestTestZeroTimeout/sleep.c @@ -1,7 +1,7 @@ #if defined(_WIN32) -#include <windows.h> +# include <windows.h> #else -#include <unistd.h> +# include <unistd.h> #endif /* sleeps for 5 seconds */ diff --git a/Tests/CompatibleInterface/main.cpp b/Tests/CompatibleInterface/main.cpp index 93723afa07..0bccb8206d 100644 --- a/Tests/CompatibleInterface/main.cpp +++ b/Tests/CompatibleInterface/main.cpp @@ -1,26 +1,26 @@ #ifndef BOOL_PROP1 -#error Expected BOOL_PROP1 +# error Expected BOOL_PROP1 #endif #ifndef BOOL_PROP2 -#error Expected BOOL_PROP2 +# error Expected BOOL_PROP2 #endif #ifndef BOOL_PROP3 -#error Expected BOOL_PROP3 +# error Expected BOOL_PROP3 #endif #ifndef STRING_PROP1 -#error Expected STRING_PROP1 +# error Expected STRING_PROP1 #endif #ifndef STRING_PROP2 -#error Expected STRING_PROP2 +# error Expected STRING_PROP2 #endif #ifndef STRING_PROP3 -#error Expected STRING_PROP3 +# error Expected STRING_PROP3 #endif template <bool test> diff --git a/Tests/CompileCommandOutput/relative.h b/Tests/CompileCommandOutput/relative.h index 221e354530..fa6eefff62 100644 --- a/Tests/CompileCommandOutput/relative.h +++ b/Tests/CompileCommandOutput/relative.h @@ -1,11 +1,11 @@ #if defined(_WIN32) -#ifdef test2_EXPORTS -#define TEST2_EXPORT __declspec(dllexport) +# ifdef test2_EXPORTS +# define TEST2_EXPORT __declspec(dllexport) +# else +# define TEST2_EXPORT __declspec(dllimport) +# endif #else -#define TEST2_EXPORT __declspec(dllimport) -#endif -#else -#define TEST2_EXPORT +# define TEST2_EXPORT #endif TEST2_EXPORT void relative(); diff --git a/Tests/CompileDefinitions/compiletest.c b/Tests/CompileDefinitions/compiletest.c index 8871750af8..66248668af 100644 --- a/Tests/CompileDefinitions/compiletest.c +++ b/Tests/CompileDefinitions/compiletest.c @@ -1,20 +1,20 @@ #ifndef LINK_C_DEFINE -#error Expected LINK_C_DEFINE +# error Expected LINK_C_DEFINE #endif #ifndef LINK_LANGUAGE_IS_C -#error Expected LINK_LANGUAGE_IS_C +# error Expected LINK_LANGUAGE_IS_C #endif #ifdef LINK_CXX_DEFINE -#error Unexpected LINK_CXX_DEFINE +# error Unexpected LINK_CXX_DEFINE #endif #ifdef LINK_LANGUAGE_IS_CXX -#error Unexpected LINK_LANGUAGE_IS_CXX +# error Unexpected LINK_LANGUAGE_IS_CXX #endif #ifdef DEBUG_MODE -#error Unexpected DEBUG_MODE +# error Unexpected DEBUG_MODE #endif int main(void) diff --git a/Tests/CompileDefinitions/compiletest.cpp b/Tests/CompileDefinitions/compiletest.cpp index 640e7cf560..328e72e91e 100644 --- a/Tests/CompileDefinitions/compiletest.cpp +++ b/Tests/CompileDefinitions/compiletest.cpp @@ -1,10 +1,10 @@ #ifndef CMAKE_IS_FUN -#error Expect CMAKE_IS_FUN definition +# error Expect CMAKE_IS_FUN definition #endif #if CMAKE_IS != Fun -#error Expect CMAKE_IS=Fun definition +# error Expect CMAKE_IS=Fun definition #endif template <bool test> @@ -43,67 +43,67 @@ enum }; #ifdef TEST_GENERATOR_EXPRESSIONS -#ifndef CMAKE_IS_DECLARATIVE -#error Expect declarative definition -#endif -#ifdef GE_NOT_DEFINED -#error Expect not defined generator expression -#endif - -#ifndef ARGUMENT -#error Expected define expanded from list -#endif -#ifndef LIST -#error Expected define expanded from list -#endif - -#ifndef PREFIX_DEF1 -#error Expect PREFIX_DEF1 -#endif - -#ifndef PREFIX_DEF2 -#error Expect PREFIX_DEF2 -#endif - -#ifndef LINK_CXX_DEFINE -#error Expected LINK_CXX_DEFINE -#endif -#ifndef LINK_LANGUAGE_IS_CXX -#error Expected LINK_LANGUAGE_IS_CXX -#endif - -#ifdef LINK_C_DEFINE -#error Unexpected LINK_C_DEFINE -#endif -#ifdef LINK_LANGUAGE_IS_C -#error Unexpected LINK_LANGUAGE_IS_C -#endif +# ifndef CMAKE_IS_DECLARATIVE +# error Expect declarative definition +# endif +# ifdef GE_NOT_DEFINED +# error Expect not defined generator expression +# endif + +# ifndef ARGUMENT +# error Expected define expanded from list +# endif +# ifndef LIST +# error Expected define expanded from list +# endif + +# ifndef PREFIX_DEF1 +# error Expect PREFIX_DEF1 +# endif + +# ifndef PREFIX_DEF2 +# error Expect PREFIX_DEF2 +# endif + +# ifndef LINK_CXX_DEFINE +# error Expected LINK_CXX_DEFINE +# endif +# ifndef LINK_LANGUAGE_IS_CXX +# error Expected LINK_LANGUAGE_IS_CXX +# endif + +# ifdef LINK_C_DEFINE +# error Unexpected LINK_C_DEFINE +# endif +# ifdef LINK_LANGUAGE_IS_C +# error Unexpected LINK_LANGUAGE_IS_C +# endif // TEST_GENERATOR_EXPRESSIONS #endif #ifndef BUILD_IS_DEBUG -#error "BUILD_IS_DEBUG not defined!" +# error "BUILD_IS_DEBUG not defined!" #endif #ifndef BUILD_IS_NOT_DEBUG -#error "BUILD_IS_NOT_DEBUG not defined!" +# error "BUILD_IS_NOT_DEBUG not defined!" #endif // Check per-config definitions. #ifdef TEST_CONFIG_DEBUG -#if !BUILD_IS_DEBUG -#error "BUILD_IS_DEBUG false with TEST_CONFIG_DEBUG!" -#endif -#if BUILD_IS_NOT_DEBUG -#error "BUILD_IS_NOT_DEBUG true with TEST_CONFIG_DEBUG!" -#endif +# if !BUILD_IS_DEBUG +# error "BUILD_IS_DEBUG false with TEST_CONFIG_DEBUG!" +# endif +# if BUILD_IS_NOT_DEBUG +# error "BUILD_IS_NOT_DEBUG true with TEST_CONFIG_DEBUG!" +# endif #else -#if BUILD_IS_DEBUG -#error "BUILD_IS_DEBUG true without TEST_CONFIG_DEBUG!" -#endif -#if !BUILD_IS_NOT_DEBUG -#error "BUILD_IS_NOT_DEBUG false without TEST_CONFIG_DEBUG!" -#endif +# if BUILD_IS_DEBUG +# error "BUILD_IS_DEBUG true without TEST_CONFIG_DEBUG!" +# endif +# if !BUILD_IS_NOT_DEBUG +# error "BUILD_IS_NOT_DEBUG false without TEST_CONFIG_DEBUG!" +# endif #endif int main(int argc, char** argv) diff --git a/Tests/CompileDefinitions/compiletest_mixed_c.c b/Tests/CompileDefinitions/compiletest_mixed_c.c index 5fbe45f92b..e4adef3227 100644 --- a/Tests/CompileDefinitions/compiletest_mixed_c.c +++ b/Tests/CompileDefinitions/compiletest_mixed_c.c @@ -1,20 +1,20 @@ #ifndef LINK_CXX_DEFINE -#error Expected LINK_CXX_DEFINE +# error Expected LINK_CXX_DEFINE #endif #ifndef LINK_LANGUAGE_IS_CXX -#error Expected LINK_LANGUAGE_IS_CXX +# error Expected LINK_LANGUAGE_IS_CXX #endif #ifdef LINK_C_DEFINE -#error Unexpected LINK_C_DEFINE +# error Unexpected LINK_C_DEFINE #endif #ifdef LINK_LANGUAGE_IS_C -#error Unexpected LINK_LANGUAGE_IS_C +# error Unexpected LINK_LANGUAGE_IS_C #endif #ifndef C_EXECUTABLE_LINK_LANGUAGE_IS_C -#error Expected C_EXECUTABLE_LINK_LANGUAGE_IS_C define +# error Expected C_EXECUTABLE_LINK_LANGUAGE_IS_C define #endif void someFunc(void) diff --git a/Tests/CompileDefinitions/compiletest_mixed_cxx.cpp b/Tests/CompileDefinitions/compiletest_mixed_cxx.cpp index 4eab0999ce..b50b4bf109 100644 --- a/Tests/CompileDefinitions/compiletest_mixed_cxx.cpp +++ b/Tests/CompileDefinitions/compiletest_mixed_cxx.cpp @@ -1,20 +1,20 @@ #ifndef LINK_CXX_DEFINE -#error Expected LINK_CXX_DEFINE +# error Expected LINK_CXX_DEFINE #endif #ifndef LINK_LANGUAGE_IS_CXX -#error Expected LINK_LANGUAGE_IS_CXX +# error Expected LINK_LANGUAGE_IS_CXX #endif #ifdef LINK_C_DEFINE -#error Unexpected LINK_C_DEFINE +# error Unexpected LINK_C_DEFINE #endif #ifdef LINK_LANGUAGE_IS_C -#error Unexpected LINK_LANGUAGE_IS_C +# error Unexpected LINK_LANGUAGE_IS_C #endif #ifndef C_EXECUTABLE_LINK_LANGUAGE_IS_C -#error Expected C_EXECUTABLE_LINK_LANGUAGE_IS_C define +# error Expected C_EXECUTABLE_LINK_LANGUAGE_IS_C define #endif int main(int argc, char** argv) diff --git a/Tests/CompileDefinitions/runtest.c b/Tests/CompileDefinitions/runtest.c index 7c28ab90e3..c6dac4dfce 100644 --- a/Tests/CompileDefinitions/runtest.c +++ b/Tests/CompileDefinitions/runtest.c @@ -3,7 +3,7 @@ #include <string.h> #ifndef BUILD_CONFIG_NAME -#error "BUILD_CONFIG_NAME not defined!" +# error "BUILD_CONFIG_NAME not defined!" #endif int main() diff --git a/Tests/CompileDefinitions/target_prop/usetgt.c b/Tests/CompileDefinitions/target_prop/usetgt.c index 8408a908cc..56823b0898 100644 --- a/Tests/CompileDefinitions/target_prop/usetgt.c +++ b/Tests/CompileDefinitions/target_prop/usetgt.c @@ -1,11 +1,11 @@ #ifndef TGT_DEF -#error TGT_DEF incorrectly not defined +# error TGT_DEF incorrectly not defined #endif #ifndef TGT_TYPE_STATIC_LIBRARY -#error TGT_TYPE_STATIC_LIBRARY incorrectly not defined +# error TGT_TYPE_STATIC_LIBRARY incorrectly not defined #endif #ifdef TGT_TYPE_EXECUTABLE -#error TGT_TYPE_EXECUTABLE incorrectly defined +# error TGT_TYPE_EXECUTABLE incorrectly defined #endif int main(void) { diff --git a/Tests/CompileFeatures/cxx_attribute_deprecated.cpp b/Tests/CompileFeatures/cxx_attribute_deprecated.cpp index 5482db8ca3..8faeca8703 100644 --- a/Tests/CompileFeatures/cxx_attribute_deprecated.cpp +++ b/Tests/CompileFeatures/cxx_attribute_deprecated.cpp @@ -1,8 +1,5 @@ -[[deprecated]] int foo() -{ - return 0; -} +[[deprecated]] int foo() { return 0; } int someFunc() { diff --git a/Tests/CompileFeatures/cxx_contextual_conversions.cpp b/Tests/CompileFeatures/cxx_contextual_conversions.cpp index cbc730417f..247f13f9fe 100644 --- a/Tests/CompileFeatures/cxx_contextual_conversions.cpp +++ b/Tests/CompileFeatures/cxx_contextual_conversions.cpp @@ -17,6 +17,7 @@ public: } operator T&() { return val; } operator T() const { return val; } + private: T val; }; diff --git a/Tests/CompileFeatures/cxx_generalized_initializers.cpp b/Tests/CompileFeatures/cxx_generalized_initializers.cpp index 0df0a33342..bfe0d415e3 100644 --- a/Tests/CompileFeatures/cxx_generalized_initializers.cpp +++ b/Tests/CompileFeatures/cxx_generalized_initializers.cpp @@ -1,5 +1,5 @@ #if defined(_MSC_VER) && _MSC_VER == 1800 && _MSC_FULL_VER < 180030723 -#error "VS 2013 safely supports this only with Update 3 or greater" +# error "VS 2013 safely supports this only with Update 3 or greater" #endif // Dummy implementation. Test only the compiler feature. diff --git a/Tests/CompileFeatures/cxx_lambda_init_captures.cpp b/Tests/CompileFeatures/cxx_lambda_init_captures.cpp index 46f22cb514..7e337faf41 100644 --- a/Tests/CompileFeatures/cxx_lambda_init_captures.cpp +++ b/Tests/CompileFeatures/cxx_lambda_init_captures.cpp @@ -2,6 +2,5 @@ int someFunc() { int a = 0; - return [b = static_cast<int&&>(a)]() { return b; } - (); + return [b = static_cast<int&&>(a)]() { return b; }(); } diff --git a/Tests/CompileFeatures/cxx_variadic_templates.cpp b/Tests/CompileFeatures/cxx_variadic_templates.cpp index 6951230522..627b8d939c 100644 --- a/Tests/CompileFeatures/cxx_variadic_templates.cpp +++ b/Tests/CompileFeatures/cxx_variadic_templates.cpp @@ -1,5 +1,5 @@ #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) < 407) -#define OLD_GNU +# define OLD_GNU #endif #ifdef OLD_GNU diff --git a/Tests/CompileFeatures/default_dialect.c b/Tests/CompileFeatures/default_dialect.c index 2b4627ca46..6160c2f441 100644 --- a/Tests/CompileFeatures/default_dialect.c +++ b/Tests/CompileFeatures/default_dialect.c @@ -1,20 +1,20 @@ #if DEFAULT_C11 -#if __STDC_VERSION__ < 201112L -#error Unexpected value for __STDC_VERSION__. -#endif +# if __STDC_VERSION__ < 201112L +# error Unexpected value for __STDC_VERSION__. +# endif #elif DEFAULT_C99 -#if __STDC_VERSION__ != 199901L -#error Unexpected value for __STDC_VERSION__. -#endif +# if __STDC_VERSION__ != 199901L +# error Unexpected value for __STDC_VERSION__. +# endif #else -#if !DEFAULT_C90 -#error Buildsystem error -#endif -#if defined(__STDC_VERSION__) && \ - !(defined(__SUNPRO_C) && __STDC_VERSION__ == 199409L) -#error Unexpected __STDC_VERSION__ definition -#endif +# if !DEFAULT_C90 +# error Buildsystem error +# endif +# if defined(__STDC_VERSION__) && \ + !(defined(__SUNPRO_C) && __STDC_VERSION__ == 199409L) +# error Unexpected __STDC_VERSION__ definition +# endif #endif int main() diff --git a/Tests/CompileFeatures/default_dialect.cpp b/Tests/CompileFeatures/default_dialect.cpp index 7ddcfe7ae1..3ee60a65e8 100644 --- a/Tests/CompileFeatures/default_dialect.cpp +++ b/Tests/CompileFeatures/default_dialect.cpp @@ -3,34 +3,35 @@ template <long l> struct Outputter; #if defined(_MSC_VER) && defined(_MSVC_LANG) -#define CXX_STD _MSVC_LANG +# define CXX_STD _MSVC_LANG #else -#define CXX_STD __cplusplus +# define CXX_STD __cplusplus #endif #if DEFAULT_CXX20 -#if CXX_STD <= 201703L +# if CXX_STD <= 201703L Outputter<CXX_STD> o; -#endif +# endif #elif DEFAULT_CXX17 -#if CXX_STD <= 201402L +# if CXX_STD <= 201402L Outputter<CXX_STD> o; -#endif +# endif #elif DEFAULT_CXX14 -#if CXX_STD != 201402L +# if CXX_STD != 201402L Outputter<CXX_STD> o; -#endif +# endif #elif DEFAULT_CXX11 -#if CXX_STD != 201103L +# if CXX_STD != 201103L Outputter<CXX_STD> o; -#endif +# endif #else -#if !DEFAULT_CXX98 -#error Buildsystem error -#endif -#if CXX_STD != 199711L && CXX_STD != 1 && !defined(__GXX_EXPERIMENTAL_CXX0X__) +# if !DEFAULT_CXX98 +# error Buildsystem error +# endif +# if CXX_STD != 199711L && CXX_STD != 1 && \ + !defined(__GXX_EXPERIMENTAL_CXX0X__) Outputter<CXX_STD> o; -#endif +# endif #endif int main() diff --git a/Tests/CompileFeatures/genex_test.c b/Tests/CompileFeatures/genex_test.c index e58d793e20..de408ce320 100644 --- a/Tests/CompileFeatures/genex_test.c +++ b/Tests/CompileFeatures/genex_test.c @@ -1,41 +1,41 @@ #ifndef EXPECT_C_STATIC_ASSERT -#error EXPECT_C_STATIC_ASSERT not defined +# error EXPECT_C_STATIC_ASSERT not defined #endif #ifndef EXPECT_C_FUNCTION_PROTOTYPES -#error EXPECT_C_FUNCTION_PROTOTYPES not defined +# error EXPECT_C_FUNCTION_PROTOTYPES not defined #endif #ifndef EXPECT_C_RESTRICT -#error EXPECT_C_RESTRICT not defined +# error EXPECT_C_RESTRICT not defined #endif #if !HAVE_C_STATIC_ASSERT -#if EXPECT_C_STATIC_ASSERT -#error "Expect c_static_assert feature" -#endif +# if EXPECT_C_STATIC_ASSERT +# error "Expect c_static_assert feature" +# endif #else -#if !EXPECT_C_STATIC_ASSERT -#error "Expect no c_static_assert feature" -#endif +# if !EXPECT_C_STATIC_ASSERT +# error "Expect no c_static_assert feature" +# endif #endif #if !HAVE_C_FUNCTION_PROTOTYPES -#if EXPECT_C_FUNCTION_PROTOTYPES -#error Expect c_function_prototypes support -#endif +# if EXPECT_C_FUNCTION_PROTOTYPES +# error Expect c_function_prototypes support +# endif #else -#if !EXPECT_C_FUNCTION_PROTOTYPES -#error Expect no c_function_prototypes support -#endif +# if !EXPECT_C_FUNCTION_PROTOTYPES +# error Expect no c_function_prototypes support +# endif #endif #if !HAVE_C_RESTRICT -#if EXPECT_C_RESTRICT -#error Expect c_restrict support -#endif +# if EXPECT_C_RESTRICT +# error Expect c_restrict support +# endif #else -#if !EXPECT_C_RESTRICT -#error Expect no c_restrict support -#endif +# if !EXPECT_C_RESTRICT +# error Expect no c_restrict support +# endif #endif int main() diff --git a/Tests/CompileFeatures/genex_test.cpp b/Tests/CompileFeatures/genex_test.cpp index 5303e738ee..59f9006e60 100644 --- a/Tests/CompileFeatures/genex_test.cpp +++ b/Tests/CompileFeatures/genex_test.cpp @@ -1,36 +1,36 @@ #ifndef EXPECT_FINAL -#error EXPECT_FINAL not defined +# error EXPECT_FINAL not defined #endif #ifndef EXPECT_INHERITING_CONSTRUCTORS -#error EXPECT_INHERITING_CONSTRUCTORS not defined +# error EXPECT_INHERITING_CONSTRUCTORS not defined #endif #ifndef EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL -#error EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL not defined +# error EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL not defined #endif #ifndef EXPECT_OVERRIDE_CONTROL -#error EXPECT_OVERRIDE_CONTROL not defined +# error EXPECT_OVERRIDE_CONTROL not defined #endif #ifdef TEST_CXX_STD -#if !HAVE_CXX_STD_11 -#error HAVE_CXX_STD_11 is false with CXX_STANDARD == 11 -#endif -#if HAVE_CXX_STD_14 -#error HAVE_CXX_STD_14 is true with CXX_STANDARD == 11 -#endif -#if HAVE_CXX_STD_17 -#error HAVE_CXX_STD_17 is true with CXX_STANDARD == 11 -#endif +# if !HAVE_CXX_STD_11 +# error HAVE_CXX_STD_11 is false with CXX_STANDARD == 11 +# endif +# if HAVE_CXX_STD_14 +# error HAVE_CXX_STD_14 is true with CXX_STANDARD == 11 +# endif +# if HAVE_CXX_STD_17 +# error HAVE_CXX_STD_17 is true with CXX_STANDARD == 11 +# endif #endif #if !HAVE_OVERRIDE_CONTROL -#if EXPECT_OVERRIDE_CONTROL -#error "Expect override control feature" -#endif +# if EXPECT_OVERRIDE_CONTROL +# error "Expect override control feature" +# endif #else -#if !EXPECT_OVERRIDE_CONTROL -#error "Expect no override control feature" -#endif +# if !EXPECT_OVERRIDE_CONTROL +# error "Expect no override control feature" +# endif struct A { @@ -45,37 +45,37 @@ struct B final : A #endif #if !HAVE_AUTO_TYPE -#error Expect cxx_auto_type support +# error Expect cxx_auto_type support #endif #if !HAVE_INHERITING_CONSTRUCTORS -#if EXPECT_INHERITING_CONSTRUCTORS -#error Expect cxx_inheriting_constructors support -#endif +# if EXPECT_INHERITING_CONSTRUCTORS +# error Expect cxx_inheriting_constructors support +# endif #else -#if !EXPECT_INHERITING_CONSTRUCTORS -#error Expect no cxx_inheriting_constructors support -#endif +# if !EXPECT_INHERITING_CONSTRUCTORS +# error Expect no cxx_inheriting_constructors support +# endif #endif #if !HAVE_FINAL -#if EXPECT_FINAL -#error Expect cxx_final support -#endif +# if EXPECT_FINAL +# error Expect cxx_final support +# endif #else -#if !EXPECT_FINAL -#error Expect no cxx_final support -#endif +# if !EXPECT_FINAL +# error Expect no cxx_final support +# endif #endif #if !HAVE_INHERITING_CONSTRUCTORS_AND_FINAL -#if EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL -#error Expect cxx_inheriting_constructors and cxx_final support -#endif +# if EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL +# error Expect cxx_inheriting_constructors and cxx_final support +# endif #else -#if !EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL -#error Expect no combined cxx_inheriting_constructors and cxx_final support -#endif +# if !EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL +# error Expect no combined cxx_inheriting_constructors and cxx_final support +# endif #endif int main() diff --git a/Tests/CompileOptions/main.cpp b/Tests/CompileOptions/main.cpp index 4779b88dbf..1379940c73 100644 --- a/Tests/CompileOptions/main.cpp +++ b/Tests/CompileOptions/main.cpp @@ -1,37 +1,37 @@ #ifndef TEST_DEFINE -#error Expected definition TEST_DEFINE +# error Expected definition TEST_DEFINE #endif #ifndef NEEDS_ESCAPE -#error Expected definition NEEDS_ESCAPE +# error Expected definition NEEDS_ESCAPE #endif #ifdef DO_GNU_TESTS -#ifndef TEST_DEFINE_GNU -#error Expected definition TEST_DEFINE_GNU -#endif +# ifndef TEST_DEFINE_GNU +# error Expected definition TEST_DEFINE_GNU +# endif #endif #ifndef NO_DEF_TESTS -#ifndef DEF_A -#error Expected definition DEF_A -#endif +# ifndef DEF_A +# error Expected definition DEF_A +# endif -#ifndef DEF_B -#error Expected definition DEF_B -#endif +# ifndef DEF_B +# error Expected definition DEF_B +# endif -#ifndef DEF_C -#error Expected definition DEF_C -#endif +# ifndef DEF_C +# error Expected definition DEF_C +# endif -#ifndef DEF_D -#error Expected definition DEF_D -#endif +# ifndef DEF_D +# error Expected definition DEF_D +# endif -#ifndef DEF_STR -#error Expected definition DEF_STR -#endif +# ifndef DEF_STR +# error Expected definition DEF_STR +# endif #endif #include <string.h> diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index ca39870f23..9ddf005385 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -17,7 +17,7 @@ extern "C" { #include <stdio.h> #include <sys/stat.h> #if !defined(S_ISDIR) -#define S_ISDIR(mode) ((mode)&_S_IFDIR) +# define S_ISDIR(mode) ((mode)&_S_IFDIR) #endif #ifdef COMPLEX_TEST_LINK_STATIC @@ -45,23 +45,23 @@ void cmPassed(const char* Message, const char* m2 = "") } #ifndef COMPLEX_DEFINED_PRE -#error "COMPLEX_DEFINED_PRE not defined!" +# error "COMPLEX_DEFINED_PRE not defined!" #endif #ifdef COMPLEX_DEFINED -#error "COMPLEX_DEFINED is defined but it should not!" +# error "COMPLEX_DEFINED is defined but it should not!" #endif #ifndef COMPLEX_DEFINED_POST -#error "COMPLEX_DEFINED_POST not defined!" +# error "COMPLEX_DEFINED_POST not defined!" #endif #ifndef CMAKE_IS_REALLY_FUN -#error This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work +# error This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work #endif #if defined(NDEBUG) && !defined(CMAKE_IS_FUN_IN_RELEASE_MODE) -#error Per-configuration directory-level definition not inherited. +# error Per-configuration directory-level definition not inherited. #endif // ====================================================================== @@ -200,8 +200,8 @@ int main() cmFailed(msg); } -// ---------------------------------------------------------------------- -// Test ADD_DEFINITIONS + // ---------------------------------------------------------------------- + // Test ADD_DEFINITIONS #ifndef CMAKE_IS_FUN cmFailed("CMake is not fun, so it is broken and should be fixed."); @@ -240,8 +240,8 @@ int main() cmPassed("CMake found the listfile stack properly"); #endif -// ---------------------------------------------------------------------- -// Test SET, VARIABLE_REQUIRES + // ---------------------------------------------------------------------- + // Test SET, VARIABLE_REQUIRES #ifdef SHOULD_NOT_BE_DEFINED cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED is defined."); @@ -297,8 +297,8 @@ int main() } #endif -// ---------------------------------------------------------------------- -// Test various IF/ELSE combinations + // ---------------------------------------------------------------------- + // Test various IF/ELSE combinations #ifdef SHOULD_NOT_BE_DEFINED_NOT cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_NOT is defined."); @@ -740,8 +740,8 @@ int main() cmPassed("SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is defined."); #endif -// ---------------------------------------------------------------------- -// Test FOREACH + // ---------------------------------------------------------------------- + // Test FOREACH #ifndef FOREACH_VAR1 cmFailed("the FOREACH, SET or CONFIGURE_FILE command is broken, " @@ -791,8 +791,8 @@ int main() cmPassed("WHILE command is working"); } -// ---------------------------------------------------------------------- -// Test LOAD_CACHE + // ---------------------------------------------------------------------- + // Test LOAD_CACHE #ifndef CACHE_TEST_VAR1 cmFailed("the LOAD_CACHE or CONFIGURE_FILE command is broken, " @@ -901,8 +901,8 @@ int main() TestAndRemoveFile("Executable/Temp/complex-required.txt"); -// ---------------------------------------------------------------------- -// Test FIND_LIBRARY + // ---------------------------------------------------------------------- + // Test FIND_LIBRARY #ifndef FIND_DUMMY_LIB cmFailed("the CONFIGURE_FILE command is broken, " @@ -917,8 +917,8 @@ int main() } #endif -// ---------------------------------------------------------------------- -// Test SET_SOURCE_FILES_PROPERTIES + // ---------------------------------------------------------------------- + // Test SET_SOURCE_FILES_PROPERTIES #ifndef FILE_HAS_EXTRA_COMPILE_FLAGS cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting " @@ -929,9 +929,9 @@ int main() #endif #if 0 // Disable until implemented everywhere. -#ifndef FILE_DEFINE_STRING +# ifndef FILE_DEFINE_STRING cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag"); -#else +# else if(strcmp(FILE_DEFINE_STRING, "hello") != 0) { cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag correctly"); @@ -940,7 +940,7 @@ int main() { cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_DEFINE_STRING flag"); } -#endif +# endif #endif #ifndef FILE_HAS_ABSTRACT @@ -973,10 +973,10 @@ int main() // ---------------------------------------------------------------------- // Test registry (win32) #if defined(_WIN32) && !defined(__CYGWIN__) -#ifndef REGISTRY_TEST_PATH +# ifndef REGISTRY_TEST_PATH cmFailed("the CONFIGURE_FILE command is broken, REGISTRY_TEST_PATH is not " "defined."); -#else +# else std::cout << "REGISTRY_TEST_PATH == " << REGISTRY_TEST_PATH << "\n"; if (stricmp(REGISTRY_TEST_PATH, BINARY_DIR "/registry_dir") != 0) { cmFailed("the 'read registry value' function or CONFIGURE_FILE command is " @@ -985,7 +985,7 @@ int main() } else { cmPassed("REGISTRY_TEST_PATH == ", REGISTRY_TEST_PATH); } -#endif +# endif #endif // defined(_WIN32) && !defined(__CYGWIN__) if (strcmp(CMAKE_MINIMUM_REQUIRED_VERSION, "2.4") == 0) { diff --git a/Tests/Complex/Executable/complex.file.cxx b/Tests/Complex/Executable/complex.file.cxx index cfba9ed420..55964302dc 100644 --- a/Tests/Complex/Executable/complex.file.cxx +++ b/Tests/Complex/Executable/complex.file.cxx @@ -1,5 +1,5 @@ #if 0 -#include "cmMissingHeader.h" +# include "cmMissingHeader.h" #endif int main(int, char**) diff --git a/Tests/Complex/Executable/notInAllExe.cxx b/Tests/Complex/Executable/notInAllExe.cxx index 2685073d6d..2b857b47cb 100644 --- a/Tests/Complex/Executable/notInAllExe.cxx +++ b/Tests/Complex/Executable/notInAllExe.cxx @@ -6,5 +6,5 @@ int main() } #if 1 -#error "This target should not be compiled by ALL." +# error "This target should not be compiled by ALL." #endif diff --git a/Tests/Complex/Library/notInAllLib.cxx b/Tests/Complex/Library/notInAllLib.cxx index e66ea056f2..033988fd88 100644 --- a/Tests/Complex/Library/notInAllLib.cxx +++ b/Tests/Complex/Library/notInAllLib.cxx @@ -4,5 +4,5 @@ int notInAllLibFunc() } #if 1 -#error "This target should not be compiled by ALL." +# error "This target should not be compiled by ALL." #endif diff --git a/Tests/Complex/Library/sharedFile.h b/Tests/Complex/Library/sharedFile.h index e32fcb7601..830cbd5e81 100644 --- a/Tests/Complex/Library/sharedFile.h +++ b/Tests/Complex/Library/sharedFile.h @@ -1,12 +1,12 @@ #if defined(_WIN32) || defined(WIN32) /* Win32 version */ -#ifdef CMakeTestLibraryShared_EXPORTS -#define CMakeTest_EXPORT __declspec(dllexport) -#else -#define CMakeTest_EXPORT __declspec(dllimport) -#endif +# ifdef CMakeTestLibraryShared_EXPORTS +# define CMakeTest_EXPORT __declspec(dllexport) +# else +# define CMakeTest_EXPORT __declspec(dllimport) +# endif #else /* unix needs nothing */ -#define CMakeTest_EXPORT +# define CMakeTest_EXPORT #endif CMakeTest_EXPORT int sharedFunction(); diff --git a/Tests/Complex/Library/testConly.h b/Tests/Complex/Library/testConly.h index 9b0fb73ff7..02b28ccab8 100644 --- a/Tests/Complex/Library/testConly.h +++ b/Tests/Complex/Library/testConly.h @@ -1,12 +1,12 @@ #if defined(_WIN32) || defined(WIN32) /* Win32 version */ -#ifdef CMakeTestCLibraryShared_EXPORTS -#define CMakeTest_EXPORT __declspec(dllexport) -#else -#define CMakeTest_EXPORT __declspec(dllimport) -#endif +# ifdef CMakeTestCLibraryShared_EXPORTS +# define CMakeTest_EXPORT __declspec(dllexport) +# else +# define CMakeTest_EXPORT __declspec(dllimport) +# endif #else /* unix needs nothing */ -#define CMakeTest_EXPORT +# define CMakeTest_EXPORT #endif CMakeTest_EXPORT int CsharedFunction(); diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index 9b94962e16..5b50899603 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -17,7 +17,7 @@ extern "C" { #include <stdio.h> #include <sys/stat.h> #if !defined(S_ISDIR) -#define S_ISDIR(mode) ((mode)&_S_IFDIR) +# define S_ISDIR(mode) ((mode)&_S_IFDIR) #endif #ifdef COMPLEX_TEST_LINK_STATIC @@ -45,23 +45,23 @@ void cmPassed(const char* Message, const char* m2 = "") } #ifndef COMPLEX_DEFINED_PRE -#error "COMPLEX_DEFINED_PRE not defined!" +# error "COMPLEX_DEFINED_PRE not defined!" #endif #ifdef COMPLEX_DEFINED -#error "COMPLEX_DEFINED is defined but it should not!" +# error "COMPLEX_DEFINED is defined but it should not!" #endif #ifndef COMPLEX_DEFINED_POST -#error "COMPLEX_DEFINED_POST not defined!" +# error "COMPLEX_DEFINED_POST not defined!" #endif #ifndef CMAKE_IS_REALLY_FUN -#error This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work +# error This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work #endif #if defined(NDEBUG) && !defined(CMAKE_IS_FUN_IN_RELEASE_MODE) -#error Per-configuration directory-level definition not inherited. +# error Per-configuration directory-level definition not inherited. #endif // ====================================================================== @@ -200,8 +200,8 @@ int main() cmFailed(msg); } -// ---------------------------------------------------------------------- -// Test ADD_DEFINITIONS + // ---------------------------------------------------------------------- + // Test ADD_DEFINITIONS #ifndef CMAKE_IS_FUN cmFailed("CMake is not fun, so it is broken and should be fixed."); @@ -240,8 +240,8 @@ int main() cmPassed("CMake found the listfile stack properly"); #endif -// ---------------------------------------------------------------------- -// Test SET, VARIABLE_REQUIRES + // ---------------------------------------------------------------------- + // Test SET, VARIABLE_REQUIRES #ifdef SHOULD_NOT_BE_DEFINED cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED is defined."); @@ -297,8 +297,8 @@ int main() } #endif -// ---------------------------------------------------------------------- -// Test various IF/ELSE combinations + // ---------------------------------------------------------------------- + // Test various IF/ELSE combinations #ifdef SHOULD_NOT_BE_DEFINED_NOT cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_NOT is defined."); @@ -740,8 +740,8 @@ int main() cmPassed("SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is defined."); #endif -// ---------------------------------------------------------------------- -// Test FOREACH + // ---------------------------------------------------------------------- + // Test FOREACH #ifndef FOREACH_VAR1 cmFailed("the FOREACH, SET or CONFIGURE_FILE command is broken, " @@ -791,8 +791,8 @@ int main() cmPassed("WHILE command is working"); } -// ---------------------------------------------------------------------- -// Test LOAD_CACHE + // ---------------------------------------------------------------------- + // Test LOAD_CACHE #ifndef CACHE_TEST_VAR1 cmFailed("the LOAD_CACHE or CONFIGURE_FILE command is broken, " @@ -901,8 +901,8 @@ int main() TestAndRemoveFile("Executable/Temp/complex-required.txt"); -// ---------------------------------------------------------------------- -// Test FIND_LIBRARY + // ---------------------------------------------------------------------- + // Test FIND_LIBRARY #ifndef FIND_DUMMY_LIB cmFailed("the CONFIGURE_FILE command is broken, " @@ -917,8 +917,8 @@ int main() } #endif -// ---------------------------------------------------------------------- -// Test SET_SOURCE_FILES_PROPERTIES + // ---------------------------------------------------------------------- + // Test SET_SOURCE_FILES_PROPERTIES #ifndef FILE_HAS_EXTRA_COMPILE_FLAGS cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting " @@ -929,9 +929,9 @@ int main() #endif #if 0 // Disable until implemented everywhere. -#ifndef FILE_DEFINE_STRING +# ifndef FILE_DEFINE_STRING cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag"); -#else +# else if(strcmp(FILE_DEFINE_STRING, "hello") != 0) { cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag correctly"); @@ -940,7 +940,7 @@ int main() { cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_DEFINE_STRING flag"); } -#endif +# endif #endif #ifndef FILE_HAS_ABSTRACT @@ -973,10 +973,10 @@ int main() // ---------------------------------------------------------------------- // Test registry (win32) #if defined(_WIN32) && !defined(__CYGWIN__) -#ifndef REGISTRY_TEST_PATH +# ifndef REGISTRY_TEST_PATH cmFailed("the CONFIGURE_FILE command is broken, REGISTRY_TEST_PATH is not " "defined."); -#else +# else std::cout << "REGISTRY_TEST_PATH == " << REGISTRY_TEST_PATH << "\n"; if (stricmp(REGISTRY_TEST_PATH, BINARY_DIR "/registry_dir") != 0) { cmFailed("the 'read registry value' function or CONFIGURE_FILE command is " @@ -985,7 +985,7 @@ int main() } else { cmPassed("REGISTRY_TEST_PATH == ", REGISTRY_TEST_PATH); } -#endif +# endif #endif // defined(_WIN32) && !defined(__CYGWIN__) if (strcmp(CMAKE_MINIMUM_REQUIRED_VERSION, "2.4") == 0) { diff --git a/Tests/ComplexOneConfig/Executable/complex.file.cxx b/Tests/ComplexOneConfig/Executable/complex.file.cxx index cfba9ed420..55964302dc 100644 --- a/Tests/ComplexOneConfig/Executable/complex.file.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.file.cxx @@ -1,5 +1,5 @@ #if 0 -#include "cmMissingHeader.h" +# include "cmMissingHeader.h" #endif int main(int, char**) diff --git a/Tests/ComplexOneConfig/Executable/notInAllExe.cxx b/Tests/ComplexOneConfig/Executable/notInAllExe.cxx index 2685073d6d..2b857b47cb 100644 --- a/Tests/ComplexOneConfig/Executable/notInAllExe.cxx +++ b/Tests/ComplexOneConfig/Executable/notInAllExe.cxx @@ -6,5 +6,5 @@ int main() } #if 1 -#error "This target should not be compiled by ALL." +# error "This target should not be compiled by ALL." #endif diff --git a/Tests/ComplexOneConfig/Library/notInAllLib.cxx b/Tests/ComplexOneConfig/Library/notInAllLib.cxx index e66ea056f2..033988fd88 100644 --- a/Tests/ComplexOneConfig/Library/notInAllLib.cxx +++ b/Tests/ComplexOneConfig/Library/notInAllLib.cxx @@ -4,5 +4,5 @@ int notInAllLibFunc() } #if 1 -#error "This target should not be compiled by ALL." +# error "This target should not be compiled by ALL." #endif diff --git a/Tests/ComplexOneConfig/Library/sharedFile.h b/Tests/ComplexOneConfig/Library/sharedFile.h index e32fcb7601..830cbd5e81 100644 --- a/Tests/ComplexOneConfig/Library/sharedFile.h +++ b/Tests/ComplexOneConfig/Library/sharedFile.h @@ -1,12 +1,12 @@ #if defined(_WIN32) || defined(WIN32) /* Win32 version */ -#ifdef CMakeTestLibraryShared_EXPORTS -#define CMakeTest_EXPORT __declspec(dllexport) -#else -#define CMakeTest_EXPORT __declspec(dllimport) -#endif +# ifdef CMakeTestLibraryShared_EXPORTS +# define CMakeTest_EXPORT __declspec(dllexport) +# else +# define CMakeTest_EXPORT __declspec(dllimport) +# endif #else /* unix needs nothing */ -#define CMakeTest_EXPORT +# define CMakeTest_EXPORT #endif CMakeTest_EXPORT int sharedFunction(); diff --git a/Tests/ComplexOneConfig/Library/testConly.h b/Tests/ComplexOneConfig/Library/testConly.h index 9b0fb73ff7..02b28ccab8 100644 --- a/Tests/ComplexOneConfig/Library/testConly.h +++ b/Tests/ComplexOneConfig/Library/testConly.h @@ -1,12 +1,12 @@ #if defined(_WIN32) || defined(WIN32) /* Win32 version */ -#ifdef CMakeTestCLibraryShared_EXPORTS -#define CMakeTest_EXPORT __declspec(dllexport) -#else -#define CMakeTest_EXPORT __declspec(dllimport) -#endif +# ifdef CMakeTestCLibraryShared_EXPORTS +# define CMakeTest_EXPORT __declspec(dllexport) +# else +# define CMakeTest_EXPORT __declspec(dllimport) +# endif #else /* unix needs nothing */ -#define CMakeTest_EXPORT +# define CMakeTest_EXPORT #endif CMakeTest_EXPORT int CsharedFunction(); diff --git a/Tests/Cuda/Complex/dynamic.cpp b/Tests/Cuda/Complex/dynamic.cpp index 3848ce7b56..38da6a6a8a 100644 --- a/Tests/Cuda/Complex/dynamic.cpp +++ b/Tests/Cuda/Complex/dynamic.cpp @@ -1,8 +1,8 @@ #ifdef _WIN32 -#define EXPORT __declspec(dllexport) +# define EXPORT __declspec(dllexport) #else -#define EXPORT +# define EXPORT #endif EXPORT int dynamic_base_func(int x) diff --git a/Tests/Cuda/Complex/dynamic.cu b/Tests/Cuda/Complex/dynamic.cu index a76973d62d..c3d8affa82 100644 --- a/Tests/Cuda/Complex/dynamic.cu +++ b/Tests/Cuda/Complex/dynamic.cu @@ -4,9 +4,9 @@ #include <string> #ifdef _WIN32 -#define EXPORT __declspec(dllexport) +# define EXPORT __declspec(dllexport) #else -#define EXPORT +# define EXPORT #endif int dynamic_base_func(int); diff --git a/Tests/Cuda/Complex/main.cpp b/Tests/Cuda/Complex/main.cpp index 2498235351..6ca5952a54 100644 --- a/Tests/Cuda/Complex/main.cpp +++ b/Tests/Cuda/Complex/main.cpp @@ -4,9 +4,9 @@ #include "file2.h" #ifdef _WIN32 -#define IMPORT __declspec(dllimport) +# define IMPORT __declspec(dllimport) #else -#define IMPORT +# define IMPORT #endif IMPORT int choose_cuda_device(); diff --git a/Tests/Cuda/Complex/mixed.cpp b/Tests/Cuda/Complex/mixed.cpp index bd32e51997..38a1f0c751 100644 --- a/Tests/Cuda/Complex/mixed.cpp +++ b/Tests/Cuda/Complex/mixed.cpp @@ -1,10 +1,10 @@ #ifdef _WIN32 -#define EXPORT __declspec(dllexport) -#define IMPORT __declspec(dllimport) +# define EXPORT __declspec(dllexport) +# define IMPORT __declspec(dllimport) #else -#define EXPORT -#define IMPORT +# define EXPORT +# define IMPORT #endif int dynamic_base_func(int); diff --git a/Tests/Cuda/Complex/mixed.cu b/Tests/Cuda/Complex/mixed.cu index a81ccb7312..5b85aecce7 100644 --- a/Tests/Cuda/Complex/mixed.cu +++ b/Tests/Cuda/Complex/mixed.cu @@ -5,11 +5,11 @@ #include "file2.h" #ifdef _WIN32 -#define EXPORT __declspec(dllexport) -#define IMPORT __declspec(dllimport) +# define EXPORT __declspec(dllexport) +# define IMPORT __declspec(dllimport) #else -#define EXPORT -#define IMPORT +# define EXPORT +# define IMPORT #endif result_type __device__ file1_func(int x); diff --git a/Tests/Cuda/WithC/main.c b/Tests/Cuda/WithC/main.c index cb5fddc1fe..5f3c781b0b 100644 --- a/Tests/Cuda/WithC/main.c +++ b/Tests/Cuda/WithC/main.c @@ -1,7 +1,7 @@ extern int use_cuda(void); #ifdef _WIN32 -#include <windows.h> +# include <windows.h> #endif int main() diff --git a/Tests/CudaOnly/EnableStandard/main.cu b/Tests/CudaOnly/EnableStandard/main.cu index f21958371e..740c832a61 100644 --- a/Tests/CudaOnly/EnableStandard/main.cu +++ b/Tests/CudaOnly/EnableStandard/main.cu @@ -2,9 +2,9 @@ #include <iostream> #ifdef _WIN32 -#define IMPORT __declspec(dllimport) +# define IMPORT __declspec(dllimport) #else -#define IMPORT +# define IMPORT #endif int static_cuda11_func(int); diff --git a/Tests/CudaOnly/EnableStandard/shared.cu b/Tests/CudaOnly/EnableStandard/shared.cu index ccdd0b28ee..004cb83720 100644 --- a/Tests/CudaOnly/EnableStandard/shared.cu +++ b/Tests/CudaOnly/EnableStandard/shared.cu @@ -2,9 +2,9 @@ #include <type_traits> #ifdef _WIN32 -#define EXPORT __declspec(dllexport) +# define EXPORT __declspec(dllexport) #else -#define EXPORT +# define EXPORT #endif using tt = std::true_type; diff --git a/Tests/CudaOnly/WithDefs/main.notcu b/Tests/CudaOnly/WithDefs/main.notcu index 3793d746ea..98f73cebd3 100644 --- a/Tests/CudaOnly/WithDefs/main.notcu +++ b/Tests/CudaOnly/WithDefs/main.notcu @@ -4,39 +4,39 @@ #include <inc_cuda.h> #ifndef INC_CUDA -#error "INC_CUDA not defined!" +# error "INC_CUDA not defined!" #endif #ifndef HOST_DEFINE -#error "HOST_DEFINE not defined!" +# error "HOST_DEFINE not defined!" #endif #ifndef PACKED_DEFINE -#error "PACKED_DEFINE not defined!" +# error "PACKED_DEFINE not defined!" #endif #ifndef FLAG_COMPILE_LANG_CUDA -#error "FLAG_COMPILE_LANG_CUDA not defined!" +# error "FLAG_COMPILE_LANG_CUDA not defined!" #endif #ifndef FLAG_LANG_IS_CUDA -#error "FLAG_LANG_IS_CUDA not defined!" +# error "FLAG_LANG_IS_CUDA not defined!" #endif #if !FLAG_LANG_IS_CUDA -#error "Expected FLAG_LANG_IS_CUDA" +# error "Expected FLAG_LANG_IS_CUDA" #endif #ifndef DEF_COMPILE_LANG_CUDA -#error "DEF_COMPILE_LANG_CUDA not defined!" +# error "DEF_COMPILE_LANG_CUDA not defined!" #endif #ifndef DEF_LANG_IS_CUDA -#error "DEF_LANG_IS_CUDA not defined!" +# error "DEF_LANG_IS_CUDA not defined!" #endif #if !DEF_LANG_IS_CUDA -#error "Expected DEF_LANG_IS_CUDA" +# error "Expected DEF_LANG_IS_CUDA" #endif static __global__ void DetermineIfValidCudaDevice() @@ -44,20 +44,20 @@ static __global__ void DetermineIfValidCudaDevice() } #ifdef _MSC_VER -#pragma pack(push, 1) -#undef PACKED_DEFINE -#define PACKED_DEFINE +# pragma pack(push, 1) +# undef PACKED_DEFINE +# define PACKED_DEFINE #endif struct PACKED_DEFINE result_type { bool valid; int value; #if defined(NDEBUG) && !defined(DEFREL) -#error missing DEFREL flag +# error missing DEFREL flag #endif }; #ifdef _MSC_VER -#pragma pack(pop) +# pragma pack(pop) #endif result_type can_launch_kernel() diff --git a/Tests/CustComDepend/bar.h b/Tests/CustComDepend/bar.h index c072b81a90..b0a690b572 100644 --- a/Tests/CustComDepend/bar.h +++ b/Tests/CustComDepend/bar.h @@ -1,9 +1,9 @@ #ifdef _WIN32 -#ifdef bar_EXPORTS -#define BAR_EXPORT __declspec(dllexport) +# ifdef bar_EXPORTS +# define BAR_EXPORT __declspec(dllexport) +# else +# define BAR_EXPORT __declspec(dllimport) +# endif #else -#define BAR_EXPORT __declspec(dllimport) -#endif -#else -#define BAR_EXPORT +# define BAR_EXPORT #endif diff --git a/Tests/CustomCommand/wrapper.cxx b/Tests/CustomCommand/wrapper.cxx index c380938167..33412f8b65 100644 --- a/Tests/CustomCommand/wrapper.cxx +++ b/Tests/CustomCommand/wrapper.cxx @@ -17,9 +17,10 @@ int main(int argc, char* argv[]) #ifdef CMAKE_INTDIR const char* cfg = (argc >= 4) ? argv[3] : ""; if (strcmp(cfg, CMAKE_INTDIR) != 0) { - fprintf(stderr, "Did not receive expected configuration argument:\n" - " expected [" CMAKE_INTDIR "]\n" - " received [%s]\n", + fprintf(stderr, + "Did not receive expected configuration argument:\n" + " expected [" CMAKE_INTDIR "]\n" + " received [%s]\n", cfg); return 1; } diff --git a/Tests/CxxOnly/libcxx2.h b/Tests/CxxOnly/libcxx2.h index 1d97fa0ac2..774e4e897d 100644 --- a/Tests/CxxOnly/libcxx2.h +++ b/Tests/CxxOnly/libcxx2.h @@ -1,11 +1,11 @@ #ifdef _WIN32 -#ifdef testcxx2_EXPORTS -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# ifdef testcxx2_EXPORTS +# define CM_TEST_LIB_EXPORT __declspec(dllexport) +# else +# define CM_TEST_LIB_EXPORT __declspec(dllimport) +# endif #else -#define CM_TEST_LIB_EXPORT __declspec(dllimport) -#endif -#else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif class CM_TEST_LIB_EXPORT LibCxx2Class diff --git a/Tests/CxxOnly/testCxxModule.cxx b/Tests/CxxOnly/testCxxModule.cxx index 039e8bba6c..5015d07f82 100644 --- a/Tests/CxxOnly/testCxxModule.cxx +++ b/Tests/CxxOnly/testCxxModule.cxx @@ -1,7 +1,7 @@ #ifdef _WIN32 -#define TEST_EXPORT __declspec(dllexport) +# define TEST_EXPORT __declspec(dllexport) #else -#define TEST_EXPORT +# define TEST_EXPORT #endif TEST_EXPORT int testCxxModule(void) { diff --git a/Tests/ExportImport/Export/Interface/source_target.cpp b/Tests/ExportImport/Export/Interface/source_target.cpp index 037191cf6b..1eb5b13078 100644 --- a/Tests/ExportImport/Export/Interface/source_target.cpp +++ b/Tests/ExportImport/Export/Interface/source_target.cpp @@ -1,10 +1,10 @@ #ifndef USE_FROM_BUILD_DIR -#error Expected define USE_FROM_BUILD_DIR +# error Expected define USE_FROM_BUILD_DIR #endif #ifdef USE_FROM_INSTALL_DIR -#error Unexpected define USE_FROM_INSTALL_DIR +# error Unexpected define USE_FROM_INSTALL_DIR #endif int source_symbol() diff --git a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp index 64514edb23..2f88190522 100644 --- a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp +++ b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp @@ -1,10 +1,10 @@ #ifdef USE_FROM_BUILD_DIR -#error Unexpected define USE_FROM_BUILD_DIR +# error Unexpected define USE_FROM_BUILD_DIR #endif #ifndef USE_FROM_INSTALL_DIR -#error Expected define USE_FROM_INSTALL_DIR +# error Expected define USE_FROM_INSTALL_DIR #endif int source_symbol() diff --git a/Tests/ExportImport/Export/systemlib.h b/Tests/ExportImport/Export/systemlib.h index 6fd00d5031..8ec055bb08 100644 --- a/Tests/ExportImport/Export/systemlib.h +++ b/Tests/ExportImport/Export/systemlib.h @@ -3,9 +3,9 @@ #define SYSTEMLIB_H #if defined(_WIN32) || defined(__CYGWIN__) -#define systemlib_EXPORT __declspec(dllexport) +# define systemlib_EXPORT __declspec(dllexport) #else -#define systemlib_EXPORT +# define systemlib_EXPORT #endif struct systemlib_EXPORT SystemStruct diff --git a/Tests/ExportImport/Export/testExe2.c b/Tests/ExportImport/Export/testExe2.c index f8976c46a4..958e4d2bc8 100644 --- a/Tests/ExportImport/Export/testExe2.c +++ b/Tests/ExportImport/Export/testExe2.c @@ -1,7 +1,7 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testExe2_EXPORT __declspec(dllexport) +# define testExe2_EXPORT __declspec(dllexport) #else -#define testExe2_EXPORT +# define testExe2_EXPORT #endif testExe2_EXPORT int testExe2Func(void) diff --git a/Tests/ExportImport/Export/testExe2lib.c b/Tests/ExportImport/Export/testExe2lib.c index 2a5a77bd5f..905e6c7f52 100644 --- a/Tests/ExportImport/Export/testExe2lib.c +++ b/Tests/ExportImport/Export/testExe2lib.c @@ -1,9 +1,9 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testExe2lib_EXPORT __declspec(dllexport) -#define testExe2libImp_IMPORT __declspec(dllimport) +# define testExe2lib_EXPORT __declspec(dllexport) +# define testExe2libImp_IMPORT __declspec(dllimport) #else -#define testExe2lib_EXPORT -#define testExe2libImp_IMPORT +# define testExe2lib_EXPORT +# define testExe2libImp_IMPORT #endif testExe2libImp_IMPORT int testExe2libImp(void); diff --git a/Tests/ExportImport/Export/testExe2libImp.c b/Tests/ExportImport/Export/testExe2libImp.c index aba914b88a..8892c85538 100644 --- a/Tests/ExportImport/Export/testExe2libImp.c +++ b/Tests/ExportImport/Export/testExe2libImp.c @@ -1,7 +1,7 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testExe2libImp_EXPORT __declspec(dllexport) +# define testExe2libImp_EXPORT __declspec(dllexport) #else -#define testExe2libImp_EXPORT +# define testExe2libImp_EXPORT #endif testExe2libImp_EXPORT int testExe2libImp(void) diff --git a/Tests/ExportImport/Export/testLib3.c b/Tests/ExportImport/Export/testLib3.c index cacac810f0..016fae0b1c 100644 --- a/Tests/ExportImport/Export/testLib3.c +++ b/Tests/ExportImport/Export/testLib3.c @@ -1,9 +1,9 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testLib3_EXPORT __declspec(dllexport) -#define testLib3Imp_IMPORT __declspec(dllimport) +# define testLib3_EXPORT __declspec(dllexport) +# define testLib3Imp_IMPORT __declspec(dllimport) #else -#define testLib3_EXPORT -#define testLib3Imp_IMPORT +# define testLib3_EXPORT +# define testLib3Imp_IMPORT #endif testLib3Imp_IMPORT int testLib3Imp(void); diff --git a/Tests/ExportImport/Export/testLib3Imp.c b/Tests/ExportImport/Export/testLib3Imp.c index 3d836daf1a..877d0b6bfd 100644 --- a/Tests/ExportImport/Export/testLib3Imp.c +++ b/Tests/ExportImport/Export/testLib3Imp.c @@ -1,9 +1,9 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testLib3Imp_EXPORT __declspec(dllexport) -#define testLib3ImpDep_IMPORT __declspec(dllimport) +# define testLib3Imp_EXPORT __declspec(dllexport) +# define testLib3ImpDep_IMPORT __declspec(dllimport) #else -#define testLib3Imp_EXPORT -#define testLib3ImpDep_IMPORT +# define testLib3Imp_EXPORT +# define testLib3ImpDep_IMPORT #endif testLib3ImpDep_IMPORT int testLib3ImpDep(void); diff --git a/Tests/ExportImport/Export/testLib3ImpDep.c b/Tests/ExportImport/Export/testLib3ImpDep.c index b824e03de2..4fc97836bf 100644 --- a/Tests/ExportImport/Export/testLib3ImpDep.c +++ b/Tests/ExportImport/Export/testLib3ImpDep.c @@ -1,7 +1,7 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testLib3ImpDep_EXPORT __declspec(dllexport) +# define testLib3ImpDep_EXPORT __declspec(dllexport) #else -#define testLib3ImpDep_EXPORT +# define testLib3ImpDep_EXPORT #endif testLib3ImpDep_EXPORT int testLib3ImpDep(void) diff --git a/Tests/ExportImport/Export/testLib4.c b/Tests/ExportImport/Export/testLib4.c index 0e583b176c..2031a4fd7d 100644 --- a/Tests/ExportImport/Export/testLib4.c +++ b/Tests/ExportImport/Export/testLib4.c @@ -1,7 +1,7 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testLib4_EXPORT __declspec(dllexport) +# define testLib4_EXPORT __declspec(dllexport) #else -#define testLib4_EXPORT +# define testLib4_EXPORT #endif testLib4_EXPORT int testLib4(void) diff --git a/Tests/ExportImport/Export/testLib5.c b/Tests/ExportImport/Export/testLib5.c index 7c61fc0306..edd02ebd15 100644 --- a/Tests/ExportImport/Export/testLib5.c +++ b/Tests/ExportImport/Export/testLib5.c @@ -1,7 +1,7 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testLib5_EXPORT __declspec(dllexport) +# define testLib5_EXPORT __declspec(dllexport) #else -#define testLib5_EXPORT +# define testLib5_EXPORT #endif testLib5_EXPORT int testLib5(void) diff --git a/Tests/ExportImport/Export/testLib9.c b/Tests/ExportImport/Export/testLib9.c index fe8610bfac..2f6f8ebc77 100644 --- a/Tests/ExportImport/Export/testLib9.c +++ b/Tests/ExportImport/Export/testLib9.c @@ -1,11 +1,11 @@ #ifndef testLib9ObjPub_USED -#error "testLib9ObjPub_USED not defined!" +# error "testLib9ObjPub_USED not defined!" #endif #ifndef testLib9ObjPriv_USED -#error "testLib9ObjPriv_USED not defined!" +# error "testLib9ObjPriv_USED not defined!" #endif #ifdef testLib9ObjIface_USED -#error "testLib9ObjIface_USED defined but should not be!" +# error "testLib9ObjIface_USED defined but should not be!" #endif int testLib9ObjPub(void); int testLib9ObjPriv(void); diff --git a/Tests/ExportImport/Export/testLibDepends.c b/Tests/ExportImport/Export/testLibDepends.c index c896c10efb..6100da1dc6 100644 --- a/Tests/ExportImport/Export/testLibDepends.c +++ b/Tests/ExportImport/Export/testLibDepends.c @@ -4,15 +4,15 @@ #include "testLibIncludeRequired4.h" #ifndef testLibRequired_IFACE_DEFINE -#error Expected testLibRequired_IFACE_DEFINE +# error Expected testLibRequired_IFACE_DEFINE #endif #ifndef BuildOnly_DEFINE -#error Expected BuildOnly_DEFINE +# error Expected BuildOnly_DEFINE #endif #ifdef InstallOnly_DEFINE -#error Unexpected InstallOnly_DEFINE +# error Unexpected InstallOnly_DEFINE #endif extern int testLibRequired(void); diff --git a/Tests/ExportImport/Export/testLibNoSONAME.c b/Tests/ExportImport/Export/testLibNoSONAME.c index 4d98562df5..955284852c 100644 --- a/Tests/ExportImport/Export/testLibNoSONAME.c +++ b/Tests/ExportImport/Export/testLibNoSONAME.c @@ -1,7 +1,7 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testLibNoSONAME_EXPORT __declspec(dllexport) +# define testLibNoSONAME_EXPORT __declspec(dllexport) #else -#define testLibNoSONAME_EXPORT +# define testLibNoSONAME_EXPORT #endif testLibNoSONAME_EXPORT int testLibNoSoName(void) diff --git a/Tests/ExportImport/Import/A/cmp0022NEW_test.cpp b/Tests/ExportImport/Import/A/cmp0022NEW_test.cpp index 587834987d..778b8287e9 100644 --- a/Tests/ExportImport/Import/A/cmp0022NEW_test.cpp +++ b/Tests/ExportImport/Import/A/cmp0022NEW_test.cpp @@ -1,9 +1,9 @@ #ifndef USING_TESTLIB2 -#error Expected USING_TESTLIB2 +# error Expected USING_TESTLIB2 #endif #ifdef USING_TESTLIB3 -#error Unexpected USING_TESTLIB3 +# error Unexpected USING_TESTLIB3 #endif int main(void) diff --git a/Tests/ExportImport/Import/A/cmp0022OLD_test.cpp b/Tests/ExportImport/Import/A/cmp0022OLD_test.cpp index e50158b76f..9eaaee9b4b 100644 --- a/Tests/ExportImport/Import/A/cmp0022OLD_test.cpp +++ b/Tests/ExportImport/Import/A/cmp0022OLD_test.cpp @@ -1,9 +1,9 @@ #ifdef USING_TESTLIB2 -#error Unexpected USING_TESTLIB2 +# error Unexpected USING_TESTLIB2 #endif #ifndef USING_TESTLIB3 -#error Expected USING_TESTLIB3 +# error Expected USING_TESTLIB3 #endif int main(void) diff --git a/Tests/ExportImport/Import/A/deps_iface.c b/Tests/ExportImport/Import/A/deps_iface.c index 1539bcb686..e2d973c2f6 100644 --- a/Tests/ExportImport/Import/A/deps_iface.c +++ b/Tests/ExportImport/Import/A/deps_iface.c @@ -14,15 +14,15 @@ #include "installIncludesTest8.h" #ifndef testLibRequired_IFACE_DEFINE -#error Expected testLibRequired_IFACE_DEFINE +# error Expected testLibRequired_IFACE_DEFINE #endif #ifdef BuildOnly_DEFINE -#error Unexpected BuildOnly_DEFINE +# error Unexpected BuildOnly_DEFINE #endif #ifndef InstallOnly_DEFINE -#error Expected InstallOnly_DEFINE +# error Expected InstallOnly_DEFINE #endif extern int testLibDepends(void); diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp index 3658ab5489..d239fb4183 100644 --- a/Tests/ExportImport/Import/A/deps_shared_iface.cpp +++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp @@ -3,32 +3,32 @@ #include "testSharedLibDepends.h" #ifdef CHECK_PIC_WORKS -#if defined(__ELF__) && !defined(__PIC__) && !defined(__PIE__) -#error Expected by INTERFACE_POSITION_INDEPENDENT_CODE property of dependency -#endif +# if defined(__ELF__) && !defined(__PIC__) && !defined(__PIE__) +# error Expected by INTERFACE_POSITION_INDEPENDENT_CODE property of dependency +# endif #endif #ifndef PIC_PROPERTY_IS_ON -#error Expected PIC_PROPERTY_IS_ON +# error Expected PIC_PROPERTY_IS_ON #endif #ifndef CUSTOM_PROPERTY_IS_ON -#error Expected CUSTOM_PROPERTY_IS_ON +# error Expected CUSTOM_PROPERTY_IS_ON #endif #ifndef CUSTOM_STRING_IS_MATCH -#error Expected CUSTOM_STRING_IS_MATCH +# error Expected CUSTOM_STRING_IS_MATCH #endif #ifdef TEST_SUBDIR_LIB -#include "renamed.h" -#include "subdir.h" +# include "renamed.h" +# include "subdir.h" #endif #ifdef DO_GNU_TESTS -#ifndef CUSTOM_COMPILE_OPTION -#error Expected CUSTOM_COMPILE_OPTION -#endif +# ifndef CUSTOM_COMPILE_OPTION +# error Expected CUSTOM_COMPILE_OPTION +# endif #endif int main(int, char**) diff --git a/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp b/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp index 357f64f02a..ddb8c4b35d 100644 --- a/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp +++ b/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp @@ -2,5 +2,5 @@ #include <testLib4/testLib4.h> #ifndef TESTLIB4_H -#error Expected define TESTLIB4_H +# error Expected define TESTLIB4_H #endif diff --git a/Tests/ExportImport/Import/A/iface_test.cpp b/Tests/ExportImport/Import/A/iface_test.cpp index fa4474bdbe..4428c1c509 100644 --- a/Tests/ExportImport/Import/A/iface_test.cpp +++ b/Tests/ExportImport/Import/A/iface_test.cpp @@ -1,6 +1,6 @@ #ifndef USING_TESTSHAREDLIBREQUIRED -#error Expected USING_TESTSHAREDLIBREQUIRED +# error Expected USING_TESTSHAREDLIBREQUIRED #endif #include "excludedFromAll.h" diff --git a/Tests/ExportImport/Import/A/imp_mod1.c b/Tests/ExportImport/Import/A/imp_mod1.c index 89d7545954..9385d55193 100644 --- a/Tests/ExportImport/Import/A/imp_mod1.c +++ b/Tests/ExportImport/Import/A/imp_mod1.c @@ -1,7 +1,7 @@ #if defined(_WIN32) || defined(__CYGWIN__) -#define testExe2_IMPORT __declspec(dllimport) +# define testExe2_IMPORT __declspec(dllimport) #else -#define testExe2_IMPORT +# define testExe2_IMPORT #endif testExe2_IMPORT int testExe2Func(void); diff --git a/Tests/ExportImport/Import/A/imp_testExe1.c b/Tests/ExportImport/Import/A/imp_testExe1.c index 348843928a..8173557cdc 100644 --- a/Tests/ExportImport/Import/A/imp_testExe1.c +++ b/Tests/ExportImport/Import/A/imp_testExe1.c @@ -14,9 +14,9 @@ extern int testLibPerConfigDest(void); /* Switch a symbol between debug and optimized builds to make sure the proper library is found from the testLib4 link interface. */ #ifdef EXE_DBG -#define testLib4libcfg testLib4libdbg +# define testLib4libcfg testLib4libdbg #else -#define testLib4libcfg testLib4libopt +# define testLib4libcfg testLib4libopt #endif extern testLib4libcfg(void); diff --git a/Tests/ExportImport/Import/A/imp_testExeAbs1.c b/Tests/ExportImport/Import/A/imp_testExeAbs1.c index 629b891f10..fd05242066 100644 --- a/Tests/ExportImport/Import/A/imp_testExeAbs1.c +++ b/Tests/ExportImport/Import/A/imp_testExeAbs1.c @@ -2,10 +2,10 @@ #include "testLibAbs1a.h" #include "testLibAbs1b.h" #ifndef testLibAbs1a -#error "testLibAbs1a not defined" +# error "testLibAbs1a not defined" #endif #ifndef testLibAbs1b -#error "testLibAbs1b not defined" +# error "testLibAbs1b not defined" #endif int main() { diff --git a/Tests/ExportImport/Import/A/imp_testLib9.c b/Tests/ExportImport/Import/A/imp_testLib9.c index f9c05fd22e..e014857ecb 100644 --- a/Tests/ExportImport/Import/A/imp_testLib9.c +++ b/Tests/ExportImport/Import/A/imp_testLib9.c @@ -1,11 +1,11 @@ #ifndef testLib9ObjPub_USED -#error "testLib9ObjPub_USED not defined!" +# error "testLib9ObjPub_USED not defined!" #endif #ifdef testLib9ObjPriv_USED -#error "testLib9ObjPriv_USED defined but should not be!" +# error "testLib9ObjPriv_USED defined but should not be!" #endif #ifndef testLib9ObjIface_USED -#error "testLib9ObjIface_USED not defined!" +# error "testLib9ObjIface_USED not defined!" #endif int testLib9(void); diff --git a/Tests/ExportImport/Import/Interface/headeronlytest.cpp b/Tests/ExportImport/Import/Interface/headeronlytest.cpp index 0e754e9e3d..7b63a04965 100644 --- a/Tests/ExportImport/Import/Interface/headeronlytest.cpp +++ b/Tests/ExportImport/Import/Interface/headeronlytest.cpp @@ -2,11 +2,11 @@ #include "headeronly.h" #ifndef HEADERONLY_DEFINE -#error Expected HEADERONLY_DEFINE +# error Expected HEADERONLY_DEFINE #endif #ifdef SHAREDLIB_DEFINE -#error Unexpected SHAREDLIB_DEFINE +# error Unexpected SHAREDLIB_DEFINE #endif int main(int, char**) diff --git a/Tests/ExportImport/Import/Interface/interfacetest.cpp b/Tests/ExportImport/Import/Interface/interfacetest.cpp index 7be816286c..c1e29c2466 100644 --- a/Tests/ExportImport/Import/Interface/interfacetest.cpp +++ b/Tests/ExportImport/Import/Interface/interfacetest.cpp @@ -2,15 +2,15 @@ #include "sharedlib.h" #ifndef SHAREDLIB_DEFINE -#error Expected SHAREDLIB_DEFINE +# error Expected SHAREDLIB_DEFINE #endif #ifdef HEADERONLY_DEFINE -#error Unexpected HEADERONLY_DEFINE +# error Unexpected HEADERONLY_DEFINE #endif #ifndef DEFINE_IFACE_DEFINE -#error Expected DEFINE_IFACE_DEFINE +# error Expected DEFINE_IFACE_DEFINE #endif int main(int, char**) diff --git a/Tests/FindGTK2/cairomm/main.cpp b/Tests/FindGTK2/cairomm/main.cpp index 1a669c36e6..44326012b6 100644 --- a/Tests/FindGTK2/cairomm/main.cpp +++ b/Tests/FindGTK2/cairomm/main.cpp @@ -5,7 +5,7 @@ * et. al. */ #if defined(_MSC_VER) -#define _USE_MATH_DEFINES +# define _USE_MATH_DEFINES #endif #include <cairomm/context.h> diff --git a/Tests/FindLTTngUST/Test/main.c b/Tests/FindLTTngUST/Test/main.c index 1f313c1a9b..01d73cb736 100644 --- a/Tests/FindLTTngUST/Test/main.c +++ b/Tests/FindLTTngUST/Test/main.c @@ -4,11 +4,11 @@ #include <string.h> #ifdef CMAKE_LTTNGUST_HAS_TRACEF -#include <lttng/tracef.h> +# include <lttng/tracef.h> #endif #ifdef CMAKE_LTTNGUST_HAS_TRACELOG -#include <lttng/tracelog.h> +# include <lttng/tracelog.h> #endif int main(void) diff --git a/Tests/FindODBC/Test/main.c b/Tests/FindODBC/Test/main.c index 917167b80e..34f279ce1f 100644 --- a/Tests/FindODBC/Test/main.c +++ b/Tests/FindODBC/Test/main.c @@ -1,5 +1,5 @@ #ifdef WIN32 -#include <windows.h> +# include <windows.h> #endif #include <sql.h> diff --git a/Tests/FindOpenCL/Test/main.c b/Tests/FindOpenCL/Test/main.c index dc77636455..2fe949bd01 100644 --- a/Tests/FindOpenCL/Test/main.c +++ b/Tests/FindOpenCL/Test/main.c @@ -1,7 +1,7 @@ #ifdef __APPLE__ -#include <OpenCL/opencl.h> +# include <OpenCL/opencl.h> #else -#include <CL/cl.h> +# include <CL/cl.h> #endif int main() diff --git a/Tests/FindOpenGL/Test/main.c b/Tests/FindOpenGL/Test/main.c index bca3d7e3fa..e1f25c6300 100644 --- a/Tests/FindOpenGL/Test/main.c +++ b/Tests/FindOpenGL/Test/main.c @@ -1,10 +1,10 @@ #ifdef _WIN32 -#include <windows.h> +# include <windows.h> #endif #ifdef __APPLE__ -#include <OpenGL/gl.h> +# include <OpenGL/gl.h> #else -#include <GL/gl.h> +# include <GL/gl.h> #endif #include <stdio.h> diff --git a/Tests/FindOpenMP/Test/scaltest.c b/Tests/FindOpenMP/Test/scaltest.c index 2ee57f8336..4678b87a4d 100644 --- a/Tests/FindOpenMP/Test/scaltest.c +++ b/Tests/FindOpenMP/Test/scaltest.c @@ -1,8 +1,8 @@ #ifdef __cplusplus -#include <iostream> +# include <iostream> extern "C" #else -#include <stdio.h> +# include <stdio.h> #endif int scalprod(int n, double* x, double* y, double* res); diff --git a/Tests/ForceInclude/foo.c b/Tests/ForceInclude/foo.c index 7f550d0f9f..2a26c6f332 100644 --- a/Tests/ForceInclude/foo.c +++ b/Tests/ForceInclude/foo.c @@ -1,8 +1,8 @@ #ifndef FOO_1 -#error "foo1.h not included by /FI" +# error "foo1.h not included by /FI" #endif #ifndef FOO_2 -#error "foo2.h not included by /FI" +# error "foo2.h not included by /FI" #endif int main(void) { diff --git a/Tests/Framework/foo.cxx b/Tests/Framework/foo.cxx index c3520c1ddf..a4d15f609f 100644 --- a/Tests/Framework/foo.cxx +++ b/Tests/Framework/foo.cxx @@ -1,8 +1,8 @@ #include <stdio.h> #if defined(_WIN32) && defined(foo_EXPORTS) -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# define CM_TEST_LIB_EXPORT __declspec(dllexport) #else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT void foo() { diff --git a/Tests/GeneratorExpression/CMP0044/cmp0044-check.cpp b/Tests/GeneratorExpression/CMP0044/cmp0044-check.cpp index 233eb57e4b..2812b0d6f6 100644 --- a/Tests/GeneratorExpression/CMP0044/cmp0044-check.cpp +++ b/Tests/GeneratorExpression/CMP0044/cmp0044-check.cpp @@ -1,24 +1,24 @@ #ifdef Type_Is_ -#if !Result -#error Result should be 1 in WARN mode -#endif +# if !Result +# error Result should be 1 in WARN mode +# endif #endif #ifdef Type_Is_NEW -#if Result -#error Result should be 0 in NEW mode -#endif +# if Result +# error Result should be 0 in NEW mode +# endif #endif #ifdef Type_Is_OLD -#if !Result -#error Result should be 1 in OLD mode -#endif +# if !Result +# error Result should be 1 in OLD mode +# endif #endif #if !defined(Type_Is_) && !defined(Type_Is_OLD) && !defined(Type_Is_NEW) -#error No expected definition present +# error No expected definition present #endif void foo(void) diff --git a/Tests/GeneratorExpression/pwd.c b/Tests/GeneratorExpression/pwd.c index ed2304370a..31ebe493a3 100644 --- a/Tests/GeneratorExpression/pwd.c +++ b/Tests/GeneratorExpression/pwd.c @@ -3,11 +3,11 @@ #include <stdlib.h> #ifdef _WIN32 -#include <direct.h> -#define getcurdir _getcwd +# include <direct.h> +# define getcurdir _getcwd #else -#include <unistd.h> -#define getcurdir getcwd +# include <unistd.h> +# define getcurdir getcwd #endif int main(int argc, char* argv[]) diff --git a/Tests/IncludeDirectories/CMP0021/main.cpp b/Tests/IncludeDirectories/CMP0021/main.cpp index f638ed14a8..0f87dd9970 100644 --- a/Tests/IncludeDirectories/CMP0021/main.cpp +++ b/Tests/IncludeDirectories/CMP0021/main.cpp @@ -2,7 +2,7 @@ #include "cmp0021.h" #ifndef CMP0021_DEFINE -#error Expected CMP0021_DEFINE +# error Expected CMP0021_DEFINE #endif int main(int, char**) diff --git a/Tests/InterfaceLibrary/definetestexe.cpp b/Tests/InterfaceLibrary/definetestexe.cpp index 098502c4c5..9156426cdb 100644 --- a/Tests/InterfaceLibrary/definetestexe.cpp +++ b/Tests/InterfaceLibrary/definetestexe.cpp @@ -1,18 +1,18 @@ #ifndef IFACE_DEFINE -#error Expected IFACE_DEFINE +# error Expected IFACE_DEFINE #endif #include "iface_header.h" #ifndef IFACE_HEADER_SRCDIR -#error Expected IFACE_HEADER_SRCDIR +# error Expected IFACE_HEADER_SRCDIR #endif #include "iface_header_builddir.h" #ifndef IFACE_HEADER_BUILDDIR -#error Expected IFACE_HEADER_BUILDDIR +# error Expected IFACE_HEADER_BUILDDIR #endif extern int obj(); diff --git a/Tests/InterfaceLibrary/map_config.cpp b/Tests/InterfaceLibrary/map_config.cpp index 232a18e885..d0356327d4 100644 --- a/Tests/InterfaceLibrary/map_config.cpp +++ b/Tests/InterfaceLibrary/map_config.cpp @@ -1,12 +1,12 @@ #ifdef DEBUG_MODE -#ifndef SPECIAL_MODE -#error Special configuration should be mapped to debug configuration. -#endif +# ifndef SPECIAL_MODE +# error Special configuration should be mapped to debug configuration. +# endif #else -#ifdef SPECIAL_MODE -#error Special configuration should not be enabled if not debug configuration -#endif +# ifdef SPECIAL_MODE +# error Special configuration should not be enabled if not debug configuration +# endif #endif int main(int, char**) diff --git a/Tests/InterfaceLibrary/sharedlibtestexe.cpp b/Tests/InterfaceLibrary/sharedlibtestexe.cpp index 44f160da8b..97b5aa9005 100644 --- a/Tests/InterfaceLibrary/sharedlibtestexe.cpp +++ b/Tests/InterfaceLibrary/sharedlibtestexe.cpp @@ -1,14 +1,14 @@ #ifndef SHAREDLIB_DEFINE -#error Expected SHAREDLIB_DEFINE +# error Expected SHAREDLIB_DEFINE #endif #ifndef SHAREDDEPENDLIB_DEFINE -#error Expected SHAREDDEPENDLIB_DEFINE +# error Expected SHAREDDEPENDLIB_DEFINE #endif -#include "sharedlib.h" #include "shareddependlib.h" +#include "sharedlib.h" int main(int, char**) { diff --git a/Tests/InterfaceLinkLibraries/bang.cpp b/Tests/InterfaceLinkLibraries/bang.cpp index 2e950986be..722af9f184 100644 --- a/Tests/InterfaceLinkLibraries/bang.cpp +++ b/Tests/InterfaceLinkLibraries/bang.cpp @@ -1,10 +1,10 @@ #ifdef FOO_LIBRARY -#error Unexpected FOO_LIBRARY +# error Unexpected FOO_LIBRARY #endif #ifdef BAR_LIBRARY -#error Unexpected BAR_LIBRARY +# error Unexpected BAR_LIBRARY #endif #include "bang.h" diff --git a/Tests/InterfaceLinkLibraries/bar.cpp b/Tests/InterfaceLinkLibraries/bar.cpp index 228ed803ac..c1d95ab6e1 100644 --- a/Tests/InterfaceLinkLibraries/bar.cpp +++ b/Tests/InterfaceLinkLibraries/bar.cpp @@ -1,17 +1,17 @@ #ifdef FOO_LIBRARY -#error Unexpected FOO_LIBRARY +# error Unexpected FOO_LIBRARY #endif #ifdef BAR_USE_BANG -#ifndef BANG_LIBRARY -#error Expected BANG_LIBRARY -#endif -#include "bang.h" +# ifndef BANG_LIBRARY +# error Expected BANG_LIBRARY +# endif +# include "bang.h" #else -#ifdef BANG_LIBRARY -#error Unexpected BANG_LIBRARY -#endif +# ifdef BANG_LIBRARY +# error Unexpected BANG_LIBRARY +# endif #endif #include "bar.h" diff --git a/Tests/InterfaceLinkLibraries/foo.cpp b/Tests/InterfaceLinkLibraries/foo.cpp index 5295707b53..c1e93e8495 100644 --- a/Tests/InterfaceLinkLibraries/foo.cpp +++ b/Tests/InterfaceLinkLibraries/foo.cpp @@ -1,10 +1,10 @@ #ifdef BAR_LIBRARY -#error Unexpected BAR_LIBRARY +# error Unexpected BAR_LIBRARY #endif #ifdef BANG_LIBRARY -#error Unexpected BANG_LIBRARY +# error Unexpected BANG_LIBRARY #endif #include "foo.h" diff --git a/Tests/InterfaceLinkLibraries/main.cpp b/Tests/InterfaceLinkLibraries/main.cpp index 6e1295a10c..e8298d41c5 100644 --- a/Tests/InterfaceLinkLibraries/main.cpp +++ b/Tests/InterfaceLinkLibraries/main.cpp @@ -1,18 +1,18 @@ #ifndef FOO_LIBRARY -#error Expected FOO_LIBRARY +# error Expected FOO_LIBRARY #endif #ifndef BAR_LIBRARY -#error Expected BAR_LIBRARY +# error Expected BAR_LIBRARY #endif #ifdef BANG_LIBRARY -#error Unexpected BANG_LIBRARY +# error Unexpected BANG_LIBRARY #endif #ifdef ZOT_LIBRARY -#error Unexpected ZOT_LIBRARY +# error Unexpected ZOT_LIBRARY #endif #include "zot.h" diff --git a/Tests/Jump/Executable/jumpExecutable.cxx b/Tests/Jump/Executable/jumpExecutable.cxx index 6fa2683770..2c5961c5d1 100644 --- a/Tests/Jump/Executable/jumpExecutable.cxx +++ b/Tests/Jump/Executable/jumpExecutable.cxx @@ -1,7 +1,7 @@ #ifdef _WIN32 -#define JUMP_IMPORT __declspec(dllimport) +# define JUMP_IMPORT __declspec(dllimport) #else -#define JUMP_IMPORT extern +# define JUMP_IMPORT extern #endif extern int jumpStatic(); diff --git a/Tests/Jump/Library/Shared/jumpShared.cxx b/Tests/Jump/Library/Shared/jumpShared.cxx index 7c4dee9a82..87484b7959 100644 --- a/Tests/Jump/Library/Shared/jumpShared.cxx +++ b/Tests/Jump/Library/Shared/jumpShared.cxx @@ -1,7 +1,7 @@ #ifdef _WIN32 -#define JUMP_EXPORT __declspec(dllexport) +# define JUMP_EXPORT __declspec(dllexport) #else -#define JUMP_EXPORT +# define JUMP_EXPORT #endif JUMP_EXPORT int jumpShared() diff --git a/Tests/LinkFlags/LinkFlagsExe.c b/Tests/LinkFlags/LinkFlagsExe.c index 4d441469fb..202d34d261 100644 --- a/Tests/LinkFlags/LinkFlagsExe.c +++ b/Tests/LinkFlags/LinkFlagsExe.c @@ -5,5 +5,5 @@ int main(void) /* Intel compiler does not reject bad flags or objects! */ #if defined(__INTEL_COMPILER) -#error BADFLAG +# error BADFLAG #endif diff --git a/Tests/LinkFlags/LinkFlagsLib.c b/Tests/LinkFlags/LinkFlagsLib.c index f35420666c..bd288e9086 100644 --- a/Tests/LinkFlags/LinkFlagsLib.c +++ b/Tests/LinkFlags/LinkFlagsLib.c @@ -5,5 +5,5 @@ int flags_lib(void) /* Intel compiler does not reject bad flags or objects! */ #if defined(__INTEL_COMPILER) -#error BADFLAG +# error BADFLAG #endif diff --git a/Tests/MFC/mfc1/ChildFrm.cpp b/Tests/MFC/mfc1/ChildFrm.cpp index ddb19c6205..a415229d78 100644 --- a/Tests/MFC/mfc1/ChildFrm.cpp +++ b/Tests/MFC/mfc1/ChildFrm.cpp @@ -8,7 +8,7 @@ #include "ChildFrm.h" #ifdef _DEBUG -#define new DEBUG_NEW +# define new DEBUG_NEW #endif // CChildFrame diff --git a/Tests/MFC/mfc1/MainFrm.cpp b/Tests/MFC/mfc1/MainFrm.cpp index c5510657b7..6bd2b3d9ae 100644 --- a/Tests/MFC/mfc1/MainFrm.cpp +++ b/Tests/MFC/mfc1/MainFrm.cpp @@ -8,7 +8,7 @@ #include "MainFrm.h" #ifdef _DEBUG -#define new DEBUG_NEW +# define new DEBUG_NEW #endif // CMainFrame @@ -21,7 +21,9 @@ END_MESSAGE_MAP() static UINT indicators[] = { ID_SEPARATOR, // status line indicator - ID_INDICATOR_CAPS, ID_INDICATOR_NUM, ID_INDICATOR_SCRL, + ID_INDICATOR_CAPS, + ID_INDICATOR_NUM, + ID_INDICATOR_SCRL, }; // CMainFrame construction/destruction @@ -40,9 +42,10 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1) return -1; - if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | - CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | - CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || + if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, + WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | + CBRS_TOOLTIPS | CBRS_FLYBY | + CBRS_SIZE_DYNAMIC) || !m_wndToolBar.LoadToolBar(IDR_MAINFRAME)) { TRACE0("Failed to create toolbar\n"); return -1; // fail to create diff --git a/Tests/MFC/mfc1/Resource.h b/Tests/MFC/mfc1/Resource.h index 7184e3064c..e3a04f11ed 100644 --- a/Tests/MFC/mfc1/Resource.h +++ b/Tests/MFC/mfc1/Resource.h @@ -11,10 +11,10 @@ // Next default values for new objects // #ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 130 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 32771 -#endif +# ifndef APSTUDIO_READONLY_SYMBOLS +# define _APS_NEXT_RESOURCE_VALUE 130 +# define _APS_NEXT_CONTROL_VALUE 1000 +# define _APS_NEXT_SYMED_VALUE 101 +# define _APS_NEXT_COMMAND_VALUE 32771 +# endif #endif diff --git a/Tests/MFC/mfc1/mfc1.cpp b/Tests/MFC/mfc1/mfc1.cpp index 664c6c4ecc..892a89d272 100644 --- a/Tests/MFC/mfc1/mfc1.cpp +++ b/Tests/MFC/mfc1/mfc1.cpp @@ -11,7 +11,7 @@ #include "mfc1View.h" #ifdef _DEBUG -#define new DEBUG_NEW +# define new DEBUG_NEW #endif // Cmfc1App diff --git a/Tests/MFC/mfc1/mfc1.h b/Tests/MFC/mfc1/mfc1.h index 15e970ba05..f4fcadb45b 100644 --- a/Tests/MFC/mfc1/mfc1.h +++ b/Tests/MFC/mfc1/mfc1.h @@ -3,7 +3,7 @@ #pragma once #ifndef __AFXWIN_H__ -#error include 'stdafx.h' before including this file for PCH +# error include 'stdafx.h' before including this file for PCH #endif #include "resource.h" // main symbols diff --git a/Tests/MFC/mfc1/mfc1Doc.cpp b/Tests/MFC/mfc1/mfc1Doc.cpp index 08ab1580ab..e69b61c713 100644 --- a/Tests/MFC/mfc1/mfc1Doc.cpp +++ b/Tests/MFC/mfc1/mfc1Doc.cpp @@ -8,7 +8,7 @@ #include "mfc1Doc.h" #ifdef _DEBUG -#define new DEBUG_NEW +# define new DEBUG_NEW #endif // Cmfc1Doc diff --git a/Tests/MFC/mfc1/mfc1View.cpp b/Tests/MFC/mfc1/mfc1View.cpp index 6169ce5247..3de55cf6ea 100644 --- a/Tests/MFC/mfc1/mfc1View.cpp +++ b/Tests/MFC/mfc1/mfc1View.cpp @@ -9,7 +9,7 @@ #include "mfc1View.h" #ifdef _DEBUG -#define new DEBUG_NEW +# define new DEBUG_NEW #endif // Cmfc1View diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h index 56f8a6ab46..2680f26329 100644 --- a/Tests/MFC/mfc1/stdafx.h +++ b/Tests/MFC/mfc1/stdafx.h @@ -5,7 +5,7 @@ #pragma once #ifndef VC_EXTRALEAN -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers +# define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #endif // See http://msdn.microsoft.com/en-us/library/6sehtctf.aspx for more info @@ -17,39 +17,41 @@ // platforms. #ifndef WINVER // Allow use of features specific to Windows 95 and Windows NT 4 // or later. -#if _MSC_VER < 1600 -#define WINVER \ - 0x0400 // Change this to the appropriate value to target Windows 98 and - // Windows 2000 or later. -#else -#define WINVER 0x0501 // Target Windows XP and later with VS 10 and later -#endif +# if _MSC_VER < 1600 +# define WINVER \ + 0x0400 // Change this to the appropriate value to target Windows 98 and + // Windows 2000 or later. +# else +# define WINVER 0x0501 // Target Windows XP and later with VS 10 and later +# endif #endif #ifndef _WIN32_WINNT // Allow use of features specific to Windows NT 4 or // later. -#if _MSC_VER < 1600 -#define _WIN32_WINNT \ - 0x0400 // Change this to the appropriate value to target Windows 98 and - // Windows 2000 or later. -#else -#define _WIN32_WINNT 0x0501 // Target Windows XP and later with VS 10 and later -#endif +# if _MSC_VER < 1600 +# define _WIN32_WINNT \ + 0x0400 // Change this to the appropriate value to target Windows 98 and + // Windows 2000 or later. +# else +# define _WIN32_WINNT \ + 0x0501 // Target Windows XP and later with VS 10 and later +# endif #endif #ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or // later. -#if _MSC_VER < 1600 -#define _WIN32_WINDOWS \ - 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif +# if _MSC_VER < 1600 +# define _WIN32_WINDOWS \ + 0x0410 // Change this to the appropriate value to target Windows Me or + // later. +# endif #endif #ifndef _WIN32_IE // Allow use of features specific to IE 4.0 or later. -#if _MSC_VER < 1600 -#define _WIN32_IE \ - 0x0400 // Change this to the appropriate value to target IE 5.0 or later. -#endif +# if _MSC_VER < 1600 +# define _WIN32_IE \ + 0x0400 // Change this to the appropriate value to target IE 5.0 or later. +# endif #endif #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be @@ -65,5 +67,5 @@ #include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls #ifndef _AFX_NO_AFXCMN_SUPPORT -#include <afxcmn.h> // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT +# include <afxcmn.h> // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT diff --git a/Tests/MacRuntimePath/A/framework.h b/Tests/MacRuntimePath/A/framework.h index 343317c598..5a3cfc4575 100644 --- a/Tests/MacRuntimePath/A/framework.h +++ b/Tests/MacRuntimePath/A/framework.h @@ -3,13 +3,13 @@ #define framework_h #ifdef WIN32 -#ifdef framework_EXPORTS -#define FRAMEWORK_EXPORT __declspec(dllexport) +# ifdef framework_EXPORTS +# define FRAMEWORK_EXPORT __declspec(dllexport) +# else +# define FRAMEWORK_EXPORT __declspec(dllimport) +# endif #else -#define FRAMEWORK_EXPORT __declspec(dllimport) -#endif -#else -#define FRAMEWORK_EXPORT +# define FRAMEWORK_EXPORT #endif void FRAMEWORK_EXPORT framework(); diff --git a/Tests/MacRuntimePath/A/framework2.h b/Tests/MacRuntimePath/A/framework2.h index 7f45f4d2ff..2562396f98 100644 --- a/Tests/MacRuntimePath/A/framework2.h +++ b/Tests/MacRuntimePath/A/framework2.h @@ -3,13 +3,13 @@ #define framework2_h #ifdef WIN32 -#ifdef framework2_EXPORTS -#define FRAMEWORK2_EXPORT __declspec(dllexport) +# ifdef framework2_EXPORTS +# define FRAMEWORK2_EXPORT __declspec(dllexport) +# else +# define FRAMEWORK2_EXPORT __declspec(dllimport) +# endif #else -#define FRAMEWORK2_EXPORT __declspec(dllimport) -#endif -#else -#define FRAMEWORK2_EXPORT +# define FRAMEWORK2_EXPORT #endif void FRAMEWORK2_EXPORT framework2(); diff --git a/Tests/MacRuntimePath/A/shared.h b/Tests/MacRuntimePath/A/shared.h index 28904fd78d..5d5b6335c4 100644 --- a/Tests/MacRuntimePath/A/shared.h +++ b/Tests/MacRuntimePath/A/shared.h @@ -3,13 +3,13 @@ #define shared_h #ifdef WIN32 -#ifdef shared_EXPORTS -#define SHARED_EXPORT __declspec(dllexport) +# ifdef shared_EXPORTS +# define SHARED_EXPORT __declspec(dllexport) +# else +# define SHARED_EXPORT __declspec(dllimport) +# endif #else -#define SHARED_EXPORT __declspec(dllimport) -#endif -#else -#define SHARED_EXPORT +# define SHARED_EXPORT #endif void SHARED_EXPORT shared(); diff --git a/Tests/Module/CheckTypeSize/CheckTypeSize.c b/Tests/Module/CheckTypeSize/CheckTypeSize.c index 05c798b059..adfd2fc2ad 100644 --- a/Tests/Module/CheckTypeSize/CheckTypeSize.c +++ b/Tests/Module/CheckTypeSize/CheckTypeSize.c @@ -2,13 +2,13 @@ #include "somestruct.h" #ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> +# include <sys/types.h> #endif #ifdef HAVE_STDINT_H -#include <stdint.h> +# include <stdint.h> #endif #ifdef HAVE_STDDEF_H -#include <stddef.h> +# include <stddef.h> #endif #include <stdio.h> @@ -86,17 +86,17 @@ int main() /* long long */ #if defined(SIZEOF_LONG_LONG) CHECK(long long, SIZEOF_LONG_LONG); -#if !defined(HAVE_SIZEOF_LONG_LONG) +# if !defined(HAVE_SIZEOF_LONG_LONG) NODEF(HAVE_SIZEOF_LONG_LONG); -#endif +# endif #endif /* __int64 */ #if defined(SIZEOF___INT64) CHECK(__int64, SIZEOF___INT64); -#if !defined(HAVE_SIZEOF___INT64) +# if !defined(HAVE_SIZEOF___INT64) NODEF(HAVE_SIZEOF___INT64); -#endif +# endif #elif defined(HAVE_SIZEOF___INT64) NODEF(SIZEOF___INT64); #endif @@ -114,9 +114,9 @@ int main() /* ssize_t */ #if defined(SIZEOF_SSIZE_T) CHECK(ssize_t, SIZEOF_SSIZE_T); -#if !defined(HAVE_SIZEOF_SSIZE_T) +# if !defined(HAVE_SIZEOF_SSIZE_T) NODEF(HAVE_SIZEOF_SSIZE_T); -#endif +# endif #elif defined(HAVE_SIZEOF_SSIZE_T) NODEF(SIZEOF_SSIZE_T); #endif @@ -125,9 +125,9 @@ int main() #if defined(SIZEOF_STRUCTMEMBER_INT) CHECK(x.someint, SIZEOF_STRUCTMEMBER_INT); CHECK(x.someint, SIZEOF_INT); -#if !defined(HAVE_SIZEOF_STRUCTMEMBER_INT) +# if !defined(HAVE_SIZEOF_STRUCTMEMBER_INT) NODEF(HAVE_SIZEOF_STRUCTMEMBER_INT); -#endif +# endif #elif defined(HAVE_SIZEOF_STRUCTMEMBER_INT) NODEF(SIZEOF_STRUCTMEMBER_INT); #endif @@ -136,9 +136,9 @@ int main() #if defined(SIZEOF_STRUCTMEMBER_PTR) CHECK(x.someptr, SIZEOF_STRUCTMEMBER_PTR); CHECK(x.someptr, SIZEOF_DATA_PTR); -#if !defined(HAVE_SIZEOF_STRUCTMEMBER_PTR) +# if !defined(HAVE_SIZEOF_STRUCTMEMBER_PTR) NODEF(HAVE_SIZEOF_STRUCTMEMBER_PTR); -#endif +# endif #elif defined(HAVE_SIZEOF_STRUCTMEMBER_PTR) NODEF(SIZEOF_STRUCTMEMBER_PTR); #endif @@ -147,9 +147,9 @@ int main() #if defined(SIZEOF_STRUCTMEMBER_CHAR) CHECK(x.somechar, SIZEOF_STRUCTMEMBER_CHAR); CHECK(x.somechar, SIZEOF_CHAR); -#if !defined(HAVE_SIZEOF_STRUCTMEMBER_CHAR) +# if !defined(HAVE_SIZEOF_STRUCTMEMBER_CHAR) NODEF(HAVE_SIZEOF_STRUCTMEMBER_CHAR); -#endif +# endif #elif defined(HAVE_SIZEOF_STRUCTMEMBER_CHAR) NODEF(SIZEOF_STRUCTMEMBER_CHAR); #endif diff --git a/Tests/Module/CheckTypeSize/CheckTypeSize.cxx b/Tests/Module/CheckTypeSize/CheckTypeSize.cxx index 2ae84a32f4..15dc890c81 100644 --- a/Tests/Module/CheckTypeSize/CheckTypeSize.cxx +++ b/Tests/Module/CheckTypeSize/CheckTypeSize.cxx @@ -3,13 +3,13 @@ #include "someclass.hxx" #ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> +# include <sys/types.h> #endif #ifdef HAVE_STDINT_H -#include <stdint.h> +# include <stdint.h> #endif #ifdef HAVE_STDDEF_H -#include <stddef.h> +# include <stddef.h> #endif #include <stdio.h> @@ -87,17 +87,17 @@ int main() /* long long */ #if defined(SIZEOF_LONG_LONG) CHECK(long long, SIZEOF_LONG_LONG); -#if !defined(HAVE_SIZEOF_LONG_LONG) +# if !defined(HAVE_SIZEOF_LONG_LONG) NODEF(HAVE_SIZEOF_LONG_LONG); -#endif +# endif #endif /* __int64 */ #if defined(SIZEOF___INT64) CHECK(__int64, SIZEOF___INT64); -#if !defined(HAVE_SIZEOF___INT64) +# if !defined(HAVE_SIZEOF___INT64) NODEF(HAVE_SIZEOF___INT64); -#endif +# endif #elif defined(HAVE_SIZEOF___INT64) NODEF(SIZEOF___INT64); #endif @@ -115,9 +115,9 @@ int main() /* ssize_t */ #if defined(SIZEOF_SSIZE_T) CHECK(ssize_t, SIZEOF_SSIZE_T); -#if !defined(HAVE_SIZEOF_SSIZE_T) +# if !defined(HAVE_SIZEOF_SSIZE_T) NODEF(HAVE_SIZEOF_SSIZE_T); -#endif +# endif #elif defined(HAVE_SIZEOF_SSIZE_T) NODEF(SIZEOF_SSIZE_T); #endif @@ -126,9 +126,9 @@ int main() #if defined(SIZEOF_NS_CLASSMEMBER_INT) CHECK(y.someint, SIZEOF_NS_CLASSMEMBER_INT); CHECK(y.someint, SIZEOF_INT); -#if !defined(HAVE_SIZEOF_NS_CLASSMEMBER_INT) +# if !defined(HAVE_SIZEOF_NS_CLASSMEMBER_INT) NODEF(HAVE_SIZEOF_STRUCTMEMBER_INT); -#endif +# endif #elif defined(HAVE_SIZEOF_STRUCTMEMBER_INT) NODEF(SIZEOF_STRUCTMEMBER_INT); #endif @@ -137,9 +137,9 @@ int main() #if defined(SIZEOF_NS_CLASSMEMBER_PTR) CHECK(y.someptr, SIZEOF_NS_CLASSMEMBER_PTR); CHECK(y.someptr, SIZEOF_DATA_PTR); -#if !defined(HAVE_SIZEOF_NS_CLASSMEMBER_PTR) +# if !defined(HAVE_SIZEOF_NS_CLASSMEMBER_PTR) NODEF(HAVE_SIZEOF_NS_CLASSMEMBER_PTR); -#endif +# endif #elif defined(HAVE_SIZEOF_NS_CLASSMEMBER_PTR) NODEF(SIZEOF_NS_CLASSMEMBER_PTR); #endif @@ -148,9 +148,9 @@ int main() #if defined(SIZEOF_NS_CLASSMEMBER_CHAR) CHECK(y.somechar, SIZEOF_NS_CLASSMEMBER_CHAR); CHECK(y.somechar, SIZEOF_CHAR); -#if !defined(HAVE_SIZEOF_NS_CLASSMEMBER_CHAR) +# if !defined(HAVE_SIZEOF_NS_CLASSMEMBER_CHAR) NODEF(HAVE_SIZEOF_NS_CLASSMEMBER_CHAR); -#endif +# endif #elif defined(HAVE_SIZEOF_NS_CLASSMEMBER_CHAR) NODEF(SIZEOF_NS_CLASSMEMBER_CHAR); #endif @@ -159,9 +159,9 @@ int main() #if defined(SIZEOF_NS_CLASSMEMBER_BOOL) CHECK(y.somechar, SIZEOF_NS_CLASSMEMBER_BOOL); CHECK(y.somechar, SIZEOF_BOOL); -#if !defined(HAVE_SIZEOF_NS_CLASSMEMBER_BOOL) +# if !defined(HAVE_SIZEOF_NS_CLASSMEMBER_BOOL) NODEF(HAVE_SIZEOF_NS_CLASSMEMBER_BOOL); -#endif +# endif #elif defined(HAVE_SIZEOF_NS_CLASSMEMBER_BOOL) NODEF(SIZEOF_NS_CLASSMEMBER_BOOL); #endif diff --git a/Tests/Module/FindDependency/main.cpp b/Tests/Module/FindDependency/main.cpp index 50c5958cae..1df4cb55ee 100644 --- a/Tests/Module/FindDependency/main.cpp +++ b/Tests/Module/FindDependency/main.cpp @@ -1,26 +1,26 @@ #ifndef HAVE_PACK1 -#error Expected HAVE_PACK1 +# error Expected HAVE_PACK1 #endif #ifndef HAVE_PACK2 -#error Expected HAVE_PACK2 +# error Expected HAVE_PACK2 #endif #ifndef HAVE_PACK3 -#error Expected HAVE_PACK3 +# error Expected HAVE_PACK3 #endif #ifndef HAVE_PACK4 -#error Expected HAVE_PACK4 +# error Expected HAVE_PACK4 #endif #ifndef HAVE_PACK5 -#error Expected HAVE_PACK5 +# error Expected HAVE_PACK5 #endif #ifndef HAVE_PACK6 -#error Expected HAVE_PACK6 +# error Expected HAVE_PACK6 #endif int main(int argc, char** argv) diff --git a/Tests/Module/WriteCompilerDetectionHeader/compile_tests.h b/Tests/Module/WriteCompilerDetectionHeader/compile_tests.h index d3c2a2d399..0da8bab94f 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/compile_tests.h +++ b/Tests/Module/WriteCompilerDetectionHeader/compile_tests.h @@ -7,21 +7,21 @@ JOIN(EXPECTED_COMPILER_, FEATURE)) #if !CHECK(CXX_DELEGATING_CONSTRUCTORS) -#error cxx_delegating_constructors expected availability did not match. +# error cxx_delegating_constructors expected availability did not match. #endif #if !CHECK(CXX_VARIADIC_TEMPLATES) -#error cxx_variadic_templates expected availability did not match. +# error cxx_variadic_templates expected availability did not match. #endif #if !CHECK(VERSION_MAJOR) -#error Compiler major version did not match. +# error Compiler major version did not match. #endif #if !CHECK(VERSION_MINOR) -#error Compiler minor version did not match. +# error Compiler minor version did not match. #endif #if !CHECK(VERSION_PATCH) -#error Compiler patch version did not match. +# error Compiler patch version did not match. #endif diff --git a/Tests/Module/WriteCompilerDetectionHeader/main.c b/Tests/Module/WriteCompilerDetectionHeader/main.c index ee6abdb921..3420c67507 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/main.c +++ b/Tests/Module/WriteCompilerDetectionHeader/main.c @@ -3,25 +3,25 @@ #if !defined(TEST_COMPILER_C_FUNCTION_PROTOTYPES) || \ !TEST_COMPILER_C_FUNCTION_PROTOTYPES -#error Expected 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 -#error Expect no CXX features defined +# error Expect no CXX features defined #endif int main() diff --git a/Tests/Module/WriteCompilerDetectionHeader/main.cpp b/Tests/Module/WriteCompilerDetectionHeader/main.cpp index 9979cbae60..97116a5a88 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/main.cpp +++ b/Tests/Module/WriteCompilerDetectionHeader/main.cpp @@ -5,7 +5,7 @@ #include "compile_tests.h" #ifdef TEST_COMPILER_C_STATIC_ASSERT -#error Expect no C features defined +# error Expect no C features defined #endif TEST_STATIC_ASSERT(true); diff --git a/Tests/Module/WriteCompilerDetectionHeader/main_multi.c b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c index 6e13fd7628..28f9daea28 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/main_multi.c +++ b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c @@ -3,25 +3,25 @@ #if !defined(MULTI_COMPILER_C_FUNCTION_PROTOTYPES) || \ !MULTI_COMPILER_C_FUNCTION_PROTOTYPES -#error Expected 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 -#error Expect no CXX features defined +# error Expect no CXX features defined #endif int main() diff --git a/Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp b/Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp index d1f178f7cb..44f4d17c7e 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp +++ b/Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp @@ -5,7 +5,7 @@ #include "compile_tests.h" #ifdef MULTI_COMPILER_C_STATIC_ASSERT -#error Expect no C features defined +# error Expect no C features defined #endif MULTI_STATIC_ASSERT(true); diff --git a/Tests/ModuleDefinition/example_mod_1.c b/Tests/ModuleDefinition/example_mod_1.c index 6b355cf6be..8afdb31e79 100644 --- a/Tests/ModuleDefinition/example_mod_1.c +++ b/Tests/ModuleDefinition/example_mod_1.c @@ -1,7 +1,7 @@ #ifdef __WATCOMC__ -#define MODULE_CCONV __cdecl +# define MODULE_CCONV __cdecl #else -#define MODULE_CCONV +# define MODULE_CCONV #endif int __declspec(dllimport) example_exe_function(void); diff --git a/Tests/NewlineArgs/libcxx1.cxx b/Tests/NewlineArgs/libcxx1.cxx index 72f171d5c5..b3c219247b 100644 --- a/Tests/NewlineArgs/libcxx1.cxx +++ b/Tests/NewlineArgs/libcxx1.cxx @@ -1,10 +1,10 @@ #include "libcxx1.h" #ifdef TEST_FLAG_1 -#ifdef TEST_FLAG_2 +# ifdef TEST_FLAG_2 float LibCxx1Class::Method() { return 2.0; } -#endif +# endif #endif diff --git a/Tests/NewlineArgs/libcxx1.h b/Tests/NewlineArgs/libcxx1.h index ea094d7582..8bb09cdc23 100644 --- a/Tests/NewlineArgs/libcxx1.h +++ b/Tests/NewlineArgs/libcxx1.h @@ -2,8 +2,8 @@ class LibCxx1Class { public: #ifdef TEST_FLAG_1 -#ifdef TEST_FLAG_2 +# ifdef TEST_FLAG_2 static float Method(); -#endif +# endif #endif }; diff --git a/Tests/ObjectLibrary/A/a.h b/Tests/ObjectLibrary/A/a.h index b1fd42fac3..184df3cedf 100644 --- a/Tests/ObjectLibrary/A/a.h +++ b/Tests/ObjectLibrary/A/a.h @@ -1,6 +1,6 @@ #ifndef A_DEF -#error "A_DEF not defined" +# error "A_DEF not defined" #endif #ifdef B_DEF -#error "B_DEF must not be defined" +# error "B_DEF must not be defined" #endif diff --git a/Tests/ObjectLibrary/B/b.h b/Tests/ObjectLibrary/B/b.h index a7bd352302..de81d69f27 100644 --- a/Tests/ObjectLibrary/B/b.h +++ b/Tests/ObjectLibrary/B/b.h @@ -1,18 +1,18 @@ #ifdef A_DEF -#error "A_DEF must not be defined" +# error "A_DEF must not be defined" #endif #ifndef B_DEF -#error "B_DEF not defined" +# error "B_DEF not defined" #endif #if defined(_WIN32) && defined(Bexport) -#define EXPORT_B __declspec(dllexport) +# define EXPORT_B __declspec(dllexport) #else -#define EXPORT_B +# define EXPORT_B #endif #if defined(_WIN32) && defined(SHARED_B) -#define IMPORT_B __declspec(dllimport) +# define IMPORT_B __declspec(dllimport) #else -#define IMPORT_B +# define IMPORT_B #endif diff --git a/Tests/ObjectLibrary/c.c b/Tests/ObjectLibrary/c.c index 4c37e38b24..2692899cc1 100644 --- a/Tests/ObjectLibrary/c.c +++ b/Tests/ObjectLibrary/c.c @@ -1,7 +1,7 @@ #if defined(_WIN32) && defined(Cshared_EXPORTS) -#define EXPORT_C __declspec(dllexport) +# define EXPORT_C __declspec(dllexport) #else -#define EXPORT_C +# define EXPORT_C #endif extern int a1(void); diff --git a/Tests/ObjectLibrary/main.c b/Tests/ObjectLibrary/main.c index b2f1d44bd3..cc7568527c 100644 --- a/Tests/ObjectLibrary/main.c +++ b/Tests/ObjectLibrary/main.c @@ -1,7 +1,7 @@ #if defined(_WIN32) && defined(SHARED_C) -#define IMPORT_C __declspec(dllimport) +# define IMPORT_C __declspec(dllimport) #else -#define IMPORT_C +# define IMPORT_C #endif extern IMPORT_C int b1(void); extern IMPORT_C int b2(void); diff --git a/Tests/OutOfSource/OutOfSourceSubdir/testlib.h b/Tests/OutOfSource/OutOfSourceSubdir/testlib.h index bacf5a109a..3e012d252c 100644 --- a/Tests/OutOfSource/OutOfSourceSubdir/testlib.h +++ b/Tests/OutOfSource/OutOfSourceSubdir/testlib.h @@ -1,11 +1,11 @@ #ifdef _WIN32 -#ifdef testlib_EXPORTS -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# ifdef testlib_EXPORTS +# define CM_TEST_LIB_EXPORT __declspec(dllexport) +# else +# define CM_TEST_LIB_EXPORT __declspec(dllimport) +# endif #else -#define CM_TEST_LIB_EXPORT __declspec(dllimport) -#endif -#else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float TestLib(); diff --git a/Tests/PerConfig/pcShared.h b/Tests/PerConfig/pcShared.h index 031cd79656..2ae66cd425 100644 --- a/Tests/PerConfig/pcShared.h +++ b/Tests/PerConfig/pcShared.h @@ -2,13 +2,13 @@ #define pcShared_h #ifdef _WIN32 -#ifdef pcShared_EXPORTS -#define PC_EXPORT __declspec(dllexport) +# ifdef pcShared_EXPORTS +# define PC_EXPORT __declspec(dllexport) +# else +# define PC_EXPORT __declspec(dllimport) +# endif #else -#define PC_EXPORT __declspec(dllimport) -#endif -#else -#define PC_EXPORT +# define PC_EXPORT #endif PC_EXPORT const char* pcShared(void); diff --git a/Tests/Plugin/include/example.h b/Tests/Plugin/include/example.h index 87d992e57c..cbcb3dcc35 100644 --- a/Tests/Plugin/include/example.h +++ b/Tests/Plugin/include/example.h @@ -2,13 +2,13 @@ #define example_h #if defined(_WIN32) || defined(__CYGWIN__) -#if defined(example_exe_EXPORTS) -#define EXAMPLE_EXPORT __declspec(dllexport) +# if defined(example_exe_EXPORTS) +# define EXAMPLE_EXPORT __declspec(dllexport) +# else +# define EXAMPLE_EXPORT __declspec(dllimport) +# endif #else -#define EXAMPLE_EXPORT __declspec(dllimport) -#endif -#else -#define EXAMPLE_EXPORT +# define EXAMPLE_EXPORT #endif #ifdef __cplusplus diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx index 017fbf607e..257a35ca52 100644 --- a/Tests/Plugin/src/example_exe.cxx +++ b/Tests/Plugin/src/example_exe.cxx @@ -17,9 +17,9 @@ extern "C" int example_exe_function() } #ifdef CMAKE_INTDIR -#define CONFIG_DIR "/" CMAKE_INTDIR +# define CONFIG_DIR "/" CMAKE_INTDIR #else -#define CONFIG_DIR "" +# define CONFIG_DIR "" #endif int main() diff --git a/Tests/Plugin/src/example_mod_1.c b/Tests/Plugin/src/example_mod_1.c index a5dd9840d5..87b559d2f5 100644 --- a/Tests/Plugin/src/example_mod_1.c +++ b/Tests/Plugin/src/example_mod_1.c @@ -3,15 +3,15 @@ #include <stdio.h> #if defined(_WIN32) -#define MODULE_EXPORT __declspec(dllexport) +# define MODULE_EXPORT __declspec(dllexport) #else -#define MODULE_EXPORT +# define MODULE_EXPORT #endif #ifdef __WATCOMC__ -#define MODULE_CCONV __cdecl +# define MODULE_CCONV __cdecl #else -#define MODULE_CCONV +# define MODULE_CCONV #endif MODULE_EXPORT int MODULE_CCONV example_mod_1_function(int n) diff --git a/Tests/PrecompiledHeader/foo1.c b/Tests/PrecompiledHeader/foo1.c index 77172bae77..fef2586120 100644 --- a/Tests/PrecompiledHeader/foo1.c +++ b/Tests/PrecompiledHeader/foo1.c @@ -1,5 +1,5 @@ #ifndef foo_h -#error "Precompiled header foo_precompiled.h has not been loaded." +# error "Precompiled header foo_precompiled.h has not been loaded." #endif int main() diff --git a/Tests/PrecompiledHeader/foo2.c b/Tests/PrecompiledHeader/foo2.c index f192e16152..3ed04ed992 100644 --- a/Tests/PrecompiledHeader/foo2.c +++ b/Tests/PrecompiledHeader/foo2.c @@ -1,6 +1,6 @@ #ifndef foo_h -#include "foo.h" -#error "Precompiled header foo_precompiled.h has not been loaded." +# include "foo.h" +# error "Precompiled header foo_precompiled.h has not been loaded." #endif int foo() diff --git a/Tests/Preprocess/preprocess.c b/Tests/Preprocess/preprocess.c index 1b038b0c5d..2913f937a2 100644 --- a/Tests/Preprocess/preprocess.c +++ b/Tests/Preprocess/preprocess.c @@ -33,117 +33,117 @@ int check_defines_C(void) } } #ifdef NDEBUG -#ifdef FILE_DEF_DEBUG +# ifdef FILE_DEF_DEBUG { fprintf(stderr, "FILE_DEF_DEBUG should not be defined in C\n"); result = 0; } -#endif -#ifdef TARGET_DEF_DEBUG +# endif +# ifdef TARGET_DEF_DEBUG { fprintf(stderr, "TARGET_DEF_DEBUG should not be defined in C\n"); result = 0; } -#endif -#ifdef DIRECTORY_DEF_DEBUG +# endif +# ifdef DIRECTORY_DEF_DEBUG { fprintf(stderr, "DIRECTORY_DEF_DEBUG should not be defined in C\n"); result = 0; } -#endif -#ifndef FILE_DEF_RELEASE -#ifndef PREPROCESS_XCODE +# endif +# ifndef FILE_DEF_RELEASE +# ifndef PREPROCESS_XCODE { fprintf(stderr, "FILE_DEF_RELEASE should be defined in C\n"); result = 0; } -#endif -#endif -#ifndef TARGET_DEF_RELEASE +# endif +# endif +# ifndef TARGET_DEF_RELEASE { fprintf(stderr, "TARGET_DEF_RELEASE should be defined in C\n"); result = 0; } -#endif -#ifndef DIRECTORY_DEF_RELEASE +# endif +# ifndef DIRECTORY_DEF_RELEASE { fprintf(stderr, "DIRECTORY_DEF_RELEASE should be defined in C\n"); result = 0; } -#endif +# endif #endif #ifdef PREPROCESS_DEBUG -#ifndef FILE_DEF_DEBUG -#ifndef PREPROCESS_XCODE +# ifndef FILE_DEF_DEBUG +# ifndef PREPROCESS_XCODE { fprintf(stderr, "FILE_DEF_DEBUG should be defined in C\n"); result = 0; } -#endif -#endif -#ifndef TARGET_DEF_DEBUG +# endif +# endif +# ifndef TARGET_DEF_DEBUG { fprintf(stderr, "TARGET_DEF_DEBUG should be defined in C\n"); result = 0; } -#endif -#ifndef DIRECTORY_DEF_DEBUG +# endif +# ifndef DIRECTORY_DEF_DEBUG { fprintf(stderr, "DIRECTORY_DEF_DEBUG should be defined in C\n"); result = 0; } -#endif -#ifdef FILE_DEF_RELEASE +# endif +# ifdef FILE_DEF_RELEASE { fprintf(stderr, "FILE_DEF_RELEASE should not be defined in C\n"); result = 0; } -#endif -#ifdef TARGET_DEF_RELEASE +# endif +# ifdef TARGET_DEF_RELEASE { fprintf(stderr, "TARGET_DEF_RELEASE should not be defined in C\n"); result = 0; } -#endif -#ifdef DIRECTORY_DEF_RELEASE +# endif +# ifdef DIRECTORY_DEF_RELEASE { fprintf(stderr, "DIRECTORY_DEF_RELEASE should not be defined in C\n"); result = 0; } -#endif +# endif #endif #if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG) -#if !defined(FILE_DEF_DEBUG) || !defined(TARGET_DEF_DEBUG) -#ifndef PREPROCESS_XCODE +# if !defined(FILE_DEF_DEBUG) || !defined(TARGET_DEF_DEBUG) +# ifndef PREPROCESS_XCODE { fprintf(stderr, "FILE_DEF_DEBUG and TARGET_DEF_DEBUG inconsistent in C\n"); result = 0; } -#endif -#endif -#if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE) +# endif +# endif +# if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE) { fprintf(stderr, "DEBUG and RELEASE definitions inconsistent in C\n"); result = 0; } -#endif +# endif #endif #if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE) -#if !defined(FILE_DEF_RELEASE) || !defined(TARGET_DEF_RELEASE) -#ifndef PREPROCESS_XCODE +# if !defined(FILE_DEF_RELEASE) || !defined(TARGET_DEF_RELEASE) +# ifndef PREPROCESS_XCODE { fprintf(stderr, "FILE_DEF_RELEASE and TARGET_DEF_RELEASE inconsistent in C\n"); result = 0; } -#endif -#endif -#if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG) +# endif +# endif +# if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG) { fprintf(stderr, "RELEASE and DEBUG definitions inconsistent in C\n"); result = 0; } -#endif +# endif #endif #ifndef FILE_PATH_DEF { diff --git a/Tests/Preprocess/preprocess.cxx b/Tests/Preprocess/preprocess.cxx index 0fab785254..34a69c6c69 100644 --- a/Tests/Preprocess/preprocess.cxx +++ b/Tests/Preprocess/preprocess.cxx @@ -35,118 +35,118 @@ int check_defines_CXX() } } #ifdef NDEBUG -#ifdef FILE_DEF_DEBUG +# ifdef FILE_DEF_DEBUG { fprintf(stderr, "FILE_DEF_DEBUG should not be defined in CXX\n"); result = 0; } -#endif -#ifdef TARGET_DEF_DEBUG +# endif +# ifdef TARGET_DEF_DEBUG { fprintf(stderr, "TARGET_DEF_DEBUG should not be defined in CXX\n"); result = 0; } -#endif -#ifdef DIRECTORY_DEF_DEBUG +# endif +# ifdef DIRECTORY_DEF_DEBUG { fprintf(stderr, "DIRECTORY_DEF_DEBUG should not be defined in CXX\n"); result = 0; } -#endif -#ifndef FILE_DEF_RELEASE -#ifndef PREPROCESS_XCODE +# endif +# ifndef FILE_DEF_RELEASE +# ifndef PREPROCESS_XCODE { fprintf(stderr, "FILE_DEF_RELEASE should be defined in CXX\n"); result = 0; } -#endif -#endif -#ifndef TARGET_DEF_RELEASE +# endif +# endif +# ifndef TARGET_DEF_RELEASE { fprintf(stderr, "TARGET_DEF_RELEASE should be defined in CXX\n"); result = 0; } -#endif -#ifndef DIRECTORY_DEF_RELEASE +# endif +# ifndef DIRECTORY_DEF_RELEASE { fprintf(stderr, "DIRECTORY_DEF_RELEASE should be defined in CXX\n"); result = 0; } -#endif +# endif #endif #ifdef PREPROCESS_DEBUG -#ifndef FILE_DEF_DEBUG -#ifndef PREPROCESS_XCODE +# ifndef FILE_DEF_DEBUG +# ifndef PREPROCESS_XCODE { fprintf(stderr, "FILE_DEF_DEBUG should be defined in CXX\n"); result = 0; } -#endif -#endif -#ifndef TARGET_DEF_DEBUG +# endif +# endif +# ifndef TARGET_DEF_DEBUG { fprintf(stderr, "TARGET_DEF_DEBUG should be defined in CXX\n"); result = 0; } -#endif -#ifndef DIRECTORY_DEF_DEBUG +# endif +# ifndef DIRECTORY_DEF_DEBUG { fprintf(stderr, "DIRECTORY_DEF_DEBUG should be defined in CXX\n"); result = 0; } -#endif -#ifdef FILE_DEF_RELEASE +# endif +# ifdef FILE_DEF_RELEASE { fprintf(stderr, "FILE_DEF_RELEASE should not be defined in CXX\n"); result = 0; } -#endif -#ifdef TARGET_DEF_RELEASE +# endif +# ifdef TARGET_DEF_RELEASE { fprintf(stderr, "TARGET_DEF_RELEASE should not be defined in CXX\n"); result = 0; } -#endif -#ifdef DIRECTORY_DEF_RELEASE +# endif +# ifdef DIRECTORY_DEF_RELEASE { fprintf(stderr, "DIRECTORY_DEF_RELEASE should not be defined in CXX\n"); result = 0; } -#endif +# endif #endif #if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG) -#if !defined(FILE_DEF_DEBUG) || !defined(TARGET_DEF_DEBUG) -#ifndef PREPROCESS_XCODE +# if !defined(FILE_DEF_DEBUG) || !defined(TARGET_DEF_DEBUG) +# ifndef PREPROCESS_XCODE { fprintf(stderr, "FILE_DEF_DEBUG and TARGET_DEF_DEBUG inconsistent in CXX\n"); result = 0; } -#endif -#endif -#if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE) +# endif +# endif +# if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE) { fprintf(stderr, "DEBUG and RELEASE definitions inconsistent in CXX\n"); result = 0; } -#endif +# endif #endif #if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE) -#if !defined(FILE_DEF_RELEASE) || !defined(TARGET_DEF_RELEASE) -#ifndef PREPROCESS_XCODE +# if !defined(FILE_DEF_RELEASE) || !defined(TARGET_DEF_RELEASE) +# ifndef PREPROCESS_XCODE { fprintf(stderr, "FILE_DEF_RELEASE and TARGET_DEF_RELEASE inconsistent in CXX\n"); result = 0; } -#endif -#endif -#if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG) +# endif +# endif +# if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG) { fprintf(stderr, "RELEASE and DEBUG definitions inconsistent in CXX\n"); result = 0; } -#endif +# endif #endif #ifndef FILE_PATH_DEF { diff --git a/Tests/Properties/subdirtest.cxx b/Tests/Properties/subdirtest.cxx index 02d8f3d3ff..23f1048ec0 100644 --- a/Tests/Properties/subdirtest.cxx +++ b/Tests/Properties/subdirtest.cxx @@ -1,6 +1,6 @@ #ifndef SUBDIR_TEST -#error Expected SUBDIR_TEST +# error Expected SUBDIR_TEST #endif int main(int, char**) diff --git a/Tests/Qt4Targets/activeqtexe.cpp b/Tests/Qt4Targets/activeqtexe.cpp index f17b0a6391..98176f1de1 100644 --- a/Tests/Qt4Targets/activeqtexe.cpp +++ b/Tests/Qt4Targets/activeqtexe.cpp @@ -2,7 +2,7 @@ #include <QApplication> #ifndef QT_QAXSERVER_LIB -#error Expected QT_QAXSERVER_LIB +# error Expected QT_QAXSERVER_LIB #endif #include <QAxFactory> diff --git a/Tests/Qt4Targets/main.cpp b/Tests/Qt4Targets/main.cpp index 07443b0c4d..f8eacdcdc3 100644 --- a/Tests/Qt4Targets/main.cpp +++ b/Tests/Qt4Targets/main.cpp @@ -5,11 +5,11 @@ #include <QString> #ifndef QT_CORE_LIB -#error Expected QT_CORE_LIB +# error Expected QT_CORE_LIB #endif #ifndef QT_GUI_LIB -#error Expected QT_GUI_LIB +# error Expected QT_GUI_LIB #endif int main(int argc, char** argv) diff --git a/Tests/Qt4Targets/main_gen_test.cpp b/Tests/Qt4Targets/main_gen_test.cpp index 1ea390bcf1..6616e844cb 100644 --- a/Tests/Qt4Targets/main_gen_test.cpp +++ b/Tests/Qt4Targets/main_gen_test.cpp @@ -3,7 +3,9 @@ #include "myinterface.h" -class MyObject : public QObject, MyInterface +class MyObject + : public QObject + , MyInterface { Q_OBJECT Q_INTERFACES(MyInterface) diff --git a/Tests/Qt4Targets/mywrapobject.h b/Tests/Qt4Targets/mywrapobject.h index 5d4e52aec4..231a1fe8b5 100644 --- a/Tests/Qt4Targets/mywrapobject.h +++ b/Tests/Qt4Targets/mywrapobject.h @@ -6,7 +6,9 @@ #include "myinterface.h" -class MyWrapObject : public QObject, MyInterface +class MyWrapObject + : public QObject + , MyInterface { Q_OBJECT Q_INTERFACES(MyInterface) diff --git a/Tests/QtAutogen/Complex/calwidget.cpp b/Tests/QtAutogen/Complex/calwidget.cpp index 380e98238d..8ce53f14af 100644 --- a/Tests/QtAutogen/Complex/calwidget.cpp +++ b/Tests/QtAutogen/Complex/calwidget.cpp @@ -51,7 +51,7 @@ #include "ui_calwidget.h" #ifdef UI_CALWIDGET_H -#error Definition of UI_CALWIDGET_H should be disabled by file option. +# error Definition of UI_CALWIDGET_H should be disabled by file option. #endif Window::Window() diff --git a/Tests/QtAutogen/Complex/generated.h b/Tests/QtAutogen/Complex/generated.h index 62e1607bfc..cac14dedbf 100644 --- a/Tests/QtAutogen/Complex/generated.h +++ b/Tests/QtAutogen/Complex/generated.h @@ -7,7 +7,10 @@ #include "myinterface.h" #include "myotherinterface.h" -class Generated : public QObject, MyInterface, MyOtherInterface +class Generated + : public QObject + , MyInterface + , MyOtherInterface { Q_OBJECT Q_INTERFACES(MyInterface MyOtherInterface) diff --git a/Tests/QtAutogen/Complex/main.cpp b/Tests/QtAutogen/Complex/main.cpp index d557c70b33..b5b6ed1734 100644 --- a/Tests/QtAutogen/Complex/main.cpp +++ b/Tests/QtAutogen/Complex/main.cpp @@ -52,8 +52,8 @@ #include "xyz.h" #include "yaf.h" #ifdef TEST_DEBUG_CLASS -#include "debug_class.h" -#include <iostream> +# include "debug_class.h" +# include <iostream> #endif int main(int argv, char** args) diff --git a/Tests/QtAutogen/DefinesTest/defines_test.cpp b/Tests/QtAutogen/DefinesTest/defines_test.cpp index cf4e9cb5b6..a5336221de 100644 --- a/Tests/QtAutogen/DefinesTest/defines_test.cpp +++ b/Tests/QtAutogen/DefinesTest/defines_test.cpp @@ -2,7 +2,7 @@ #include <QObject> #ifdef QT_GUI_LIB -#include <QTextDocument> +# include <QTextDocument> class SomeDocument : public QTextDocument { diff --git a/Tests/QtAutogen/UicInterface/libwidget.h b/Tests/QtAutogen/UicInterface/libwidget.h index b6f3e82525..a7ad14f626 100644 --- a/Tests/QtAutogen/UicInterface/libwidget.h +++ b/Tests/QtAutogen/UicInterface/libwidget.h @@ -6,7 +6,7 @@ #include <memory> #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) -#include <klocalizedstring.h> +# include <klocalizedstring.h> #endif #include "ui_libwidget.h" diff --git a/Tests/QtAutogen/UicInterface/mywidget.h b/Tests/QtAutogen/UicInterface/mywidget.h index c23e55de77..1d31ce7a72 100644 --- a/Tests/QtAutogen/UicInterface/mywidget.h +++ b/Tests/QtAutogen/UicInterface/mywidget.h @@ -6,7 +6,7 @@ #include <memory> #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) -#include <klocalizedstring.h> +# include <klocalizedstring.h> #endif #include "ui_mywidget.h" diff --git a/Tests/RunCMake/Android/android.cxx b/Tests/RunCMake/Android/android.cxx index 2dee8f9bd0..a6d8c551de 100644 --- a/Tests/RunCMake/Android/android.cxx +++ b/Tests/RunCMake/Android/android.cxx @@ -1,19 +1,19 @@ #include "android.h" #ifndef STL_NONE -#include <cmath> -#include <cstdio> -#ifndef STL_SYSTEM -#include <exception> -#include <typeinfo> -#ifndef STL_STLPORT -#include <cxxabi.h> -#endif -#ifndef STL_GABI -#include <iostream> -#include <string> -#endif -#endif +# include <cmath> +# include <cstdio> +# ifndef STL_SYSTEM +# include <exception> +# include <typeinfo> +# ifndef STL_STLPORT +# include <cxxabi.h> +# endif +# ifndef STL_GABI +# include <iostream> +# include <string> +# endif +# endif #endif int main() @@ -30,19 +30,19 @@ int main() try { delete (new int); } catch (std::exception const& e) { -#if defined(STL_GABI) +# if defined(STL_GABI) e.what(); typeid(e).name(); -#else +# else std::cerr << e.what() << std::endl; std::cerr << typeid(e).name() << std::endl; -#endif +# endif } -#if defined(STL_GABI) +# if defined(STL_GABI) return 0; -#else +# else std::string s; return static_cast<int>(s.size()); -#endif +# endif #endif } diff --git a/Tests/RunCMake/Android/android.h b/Tests/RunCMake/Android/android.h index a5fd67e584..2c5cd95906 100644 --- a/Tests/RunCMake/Android/android.h +++ b/Tests/RunCMake/Android/android.h @@ -1,103 +1,103 @@ #ifndef __ANDROID__ -#error "__ANDROID__ not defined" +# error "__ANDROID__ not defined" #endif #include <android/api-level.h> #if API_LEVEL != __ANDROID_API__ -#error "API levels do not match" +# error "API levels do not match" #endif #ifdef COMPILER_IS_CLANG -#ifndef __clang__ -#error "COMPILER_IS_CLANG but __clang__ is not defined" -#endif +# ifndef __clang__ +# error "COMPILER_IS_CLANG but __clang__ is not defined" +# endif #else -#ifdef __clang__ -#error "!COMPILER_IS_CLANG but __clang__ is defined" -#endif +# ifdef __clang__ +# error "!COMPILER_IS_CLANG but __clang__ is defined" +# endif #endif #ifdef ARM_MODE -#if ARM_MODE == 1 && defined(__thumb__) -#error "ARM_MODE==1 but __thumb__ is defined" -#elif ARM_MODE == 0 && !defined(__thumb__) -#error "ARM_MODE==0 but __thumb__ is not defined" -#endif +# if ARM_MODE == 1 && defined(__thumb__) +# error "ARM_MODE==1 but __thumb__ is defined" +# elif ARM_MODE == 0 && !defined(__thumb__) +# error "ARM_MODE==0 but __thumb__ is not defined" +# endif #endif #ifdef ARM_NEON -#if ARM_NEON == 0 && defined(__ARM_NEON__) -#error "ARM_NEON==0 but __ARM_NEON__ is defined" -#elif ARM_NEON == 1 && !defined(__ARM_NEON__) -#error "ARM_NEON==1 but __ARM_NEON__ is not defined" -#endif +# if ARM_NEON == 0 && defined(__ARM_NEON__) +# error "ARM_NEON==0 but __ARM_NEON__ is defined" +# elif ARM_NEON == 1 && !defined(__ARM_NEON__) +# error "ARM_NEON==1 but __ARM_NEON__ is not defined" +# endif #endif #ifdef ABI_armeabi -#ifndef __ARM_EABI__ -#error "ABI_armeabi: __ARM_EABI__ not defined" -#endif -#if __ARM_ARCH != 5 -#error "ABI_armeabi: __ARM_ARCH is not 5" -#endif +# ifndef __ARM_EABI__ +# error "ABI_armeabi: __ARM_EABI__ not defined" +# endif +# if __ARM_ARCH != 5 +# error "ABI_armeabi: __ARM_ARCH is not 5" +# endif #endif #ifdef ABI_armeabi_v6 -#ifndef __ARM_EABI__ -#error "ABI_armeabi_v6: __ARM_EABI__ not defined" -#endif -#if __ARM_ARCH != 6 -#error "ABI_armeabi_v6: __ARM_ARCH is not 6" -#endif +# ifndef __ARM_EABI__ +# error "ABI_armeabi_v6: __ARM_EABI__ not defined" +# endif +# if __ARM_ARCH != 6 +# error "ABI_armeabi_v6: __ARM_ARCH is not 6" +# endif #endif #ifdef ABI_armeabi_v7a -#ifndef __ARM_EABI__ -#error "ABI_armeabi_v7a: __ARM_EABI__ not defined" -#endif -#if __ARM_ARCH != 7 -#error "ABI_armeabi_v7a: __ARM_ARCH is not 7" -#endif +# ifndef __ARM_EABI__ +# error "ABI_armeabi_v7a: __ARM_EABI__ not defined" +# endif +# if __ARM_ARCH != 7 +# error "ABI_armeabi_v7a: __ARM_ARCH is not 7" +# endif #endif #ifdef ABI_arm64_v8a -#ifdef __ARM_EABI__ -#error "ABI_arm64_v8a: __ARM_EABI__ defined" -#endif -#ifndef __aarch64__ -#error "ABI_arm64_v8a: __aarch64__ not defined" -#endif +# ifdef __ARM_EABI__ +# error "ABI_arm64_v8a: __ARM_EABI__ defined" +# endif +# ifndef __aarch64__ +# error "ABI_arm64_v8a: __aarch64__ not defined" +# endif #endif #ifdef ABI_mips -#if __mips != 32 -#error "ABI_mips: __mips != 32" -#endif -#ifndef _ABIO32 -#error "ABI_mips: _ABIO32 not defined" -#endif +# if __mips != 32 +# error "ABI_mips: __mips != 32" +# endif +# ifndef _ABIO32 +# error "ABI_mips: _ABIO32 not defined" +# endif #endif #ifdef ABI_mips64 -#if __mips != 64 -#error "ABI_mips64: __mips != 64" -#endif -#ifndef _ABI64 -#error "ABI_mips: _ABI64 not defined" -#endif +# if __mips != 64 +# error "ABI_mips64: __mips != 64" +# endif +# ifndef _ABI64 +# error "ABI_mips: _ABI64 not defined" +# endif #endif #ifdef ABI_x86 -#ifndef __i686__ -#error "ABI_x86: __i686__ not defined" -#endif +# ifndef __i686__ +# error "ABI_x86: __i686__ not defined" +# endif #endif #ifdef ABI_x86_64 -#ifndef __x86_64__ -#error "ABI_x86_64: __x86_64__ not defined" -#endif +# ifndef __x86_64__ +# error "ABI_x86_64: __x86_64__ not defined" +# endif #endif #include <stddef.h> diff --git a/Tests/RunCMake/Android/android_sysinc.c b/Tests/RunCMake/Android/android_sysinc.c index 18d73dbc86..f7cc6f026f 100644 --- a/Tests/RunCMake/Android/android_sysinc.c +++ b/Tests/RunCMake/Android/android_sysinc.c @@ -1,7 +1,7 @@ #include <dlfcn.h> #ifndef NOT_SYSTEM_DLFCN_HEADER -#error "sysroot /usr/include appears too early" +# error "sysroot /usr/include appears too early" #endif #include "android.c" diff --git a/Tests/RunCMake/Android/android_sysinc.cxx b/Tests/RunCMake/Android/android_sysinc.cxx index 5c5694b8d7..9379f1453a 100644 --- a/Tests/RunCMake/Android/android_sysinc.cxx +++ b/Tests/RunCMake/Android/android_sysinc.cxx @@ -1,7 +1,7 @@ #include <dlfcn.h> #ifndef NOT_SYSTEM_DLFCN_HEADER -#error "sysroot /usr/include appears too early" +# error "sysroot /usr/include appears too early" #endif #include "android.cxx" diff --git a/Tests/RunCMake/AutoExportDll/foo.c b/Tests/RunCMake/AutoExportDll/foo.c index 4b1318b9e9..d13bc3ede4 100644 --- a/Tests/RunCMake/AutoExportDll/foo.c +++ b/Tests/RunCMake/AutoExportDll/foo.c @@ -1,7 +1,7 @@ #ifdef _MSC_VER -#include "windows.h" +# include "windows.h" #else -#define WINAPI +# define WINAPI #endif int WINAPI foo() diff --git a/Tests/RunCMake/AutoExportDll/hello.h b/Tests/RunCMake/AutoExportDll/hello.h index 3749b976f9..7192f65af9 100644 --- a/Tests/RunCMake/AutoExportDll/hello.h +++ b/Tests/RunCMake/AutoExportDll/hello.h @@ -1,11 +1,11 @@ #ifndef _MSC_VER -#define winexport +# define winexport #else -#ifdef autoexport_EXPORTS -#define winexport -#else -#define winexport __declspec(dllimport) -#endif +# ifdef autoexport_EXPORTS +# define winexport +# else +# define winexport __declspec(dllimport) +# endif #endif class Hello diff --git a/Tests/RunCMake/AutoExportDll/say.cxx b/Tests/RunCMake/AutoExportDll/say.cxx index 51060e8de3..c8bfcc7bd3 100644 --- a/Tests/RunCMake/AutoExportDll/say.cxx +++ b/Tests/RunCMake/AutoExportDll/say.cxx @@ -1,9 +1,9 @@ #include "hello.h" #include <stdio.h> #ifdef _MSC_VER -#include "windows.h" +# include "windows.h" #else -#define WINAPI +# define WINAPI #endif extern "C" { diff --git a/Tests/RunCMake/CSharpReferenceImport/ImportLibMixedNative.h b/Tests/RunCMake/CSharpReferenceImport/ImportLibMixedNative.h index 8d5eb626fd..76b97c4759 100644 --- a/Tests/RunCMake/CSharpReferenceImport/ImportLibMixedNative.h +++ b/Tests/RunCMake/CSharpReferenceImport/ImportLibMixedNative.h @@ -1,9 +1,9 @@ #pragma once #ifdef ImportLibMixed_EXPORTS -#define mixedAPI __declspec(dllexport) +# define mixedAPI __declspec(dllexport) #else -#define mixedAPI __declspec(dllimport) +# define mixedAPI __declspec(dllimport) #endif class mixedAPI ImportLibMixedNative diff --git a/Tests/RunCMake/CSharpReferenceImport/ImportLibNative.h b/Tests/RunCMake/CSharpReferenceImport/ImportLibNative.h index 7c85626cfb..77bcb8222b 100644 --- a/Tests/RunCMake/CSharpReferenceImport/ImportLibNative.h +++ b/Tests/RunCMake/CSharpReferenceImport/ImportLibNative.h @@ -1,9 +1,9 @@ #pragma once #ifdef ImportLibNative_EXPORTS -#define nativeAPI __declspec(dllexport) +# define nativeAPI __declspec(dllexport) #else -#define nativeAPI __declspec(dllimport) +# define nativeAPI __declspec(dllimport) #endif class nativeAPI ImportLibNative diff --git a/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp index 9ac8381831..752b49e714 100644 --- a/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp +++ b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp @@ -1,7 +1,7 @@ #include "libshared_and_static.h" #ifndef MY_CUSTOM_CONTENT_ADDED -#error "MY_CUSTOM_CONTENT_ADDED not defined!" +# error "MY_CUSTOM_CONTENT_ADDED not defined!" #endif int libshared_and_static::Class::method() const diff --git a/Tests/RunCMake/GoogleTest/timeout_test.cpp b/Tests/RunCMake/GoogleTest/timeout_test.cpp index 9162dcf456..b8ad055e8b 100644 --- a/Tests/RunCMake/GoogleTest/timeout_test.cpp +++ b/Tests/RunCMake/GoogleTest/timeout_test.cpp @@ -1,7 +1,7 @@ #if defined(_WIN32) -#include <windows.h> +# include <windows.h> #else -#include <unistd.h> +# include <unistd.h> #endif #include <iostream> diff --git a/Tests/RunCMake/ObjectLibrary/a.c b/Tests/RunCMake/ObjectLibrary/a.c index 5beb3f17ad..8e490f374a 100644 --- a/Tests/RunCMake/ObjectLibrary/a.c +++ b/Tests/RunCMake/ObjectLibrary/a.c @@ -1,7 +1,7 @@ #if defined(_WIN32) && defined(COMPILE_FOR_SHARED_LIB) -#define EXPORT __declspec(dllexport) +# define EXPORT __declspec(dllexport) #else -#define EXPORT +# define EXPORT #endif EXPORT int a(void) diff --git a/Tests/RunCMake/ObjectLibrary/b.c b/Tests/RunCMake/ObjectLibrary/b.c index 7549abf60e..220ce03029 100644 --- a/Tests/RunCMake/ObjectLibrary/b.c +++ b/Tests/RunCMake/ObjectLibrary/b.c @@ -1,7 +1,7 @@ #if defined(_WIN32) && defined(COMPILE_FOR_SHARED_LIB) -#define EXPORT __declspec(dllexport) +# define EXPORT __declspec(dllexport) #else -#define EXPORT +# define EXPORT #endif extern int a(void); @@ -10,5 +10,5 @@ EXPORT int b() return a(); } #ifndef REQUIRED -#error "REQUIRED needs to be defined" +# error "REQUIRED needs to be defined" #endif diff --git a/Tests/RunCMake/ObjectLibrary/exe.c b/Tests/RunCMake/ObjectLibrary/exe.c index 6efdae7eb7..2e08700c30 100644 --- a/Tests/RunCMake/ObjectLibrary/exe.c +++ b/Tests/RunCMake/ObjectLibrary/exe.c @@ -1,7 +1,7 @@ #if defined(_WIN32) && defined(COMPILE_FOR_SHARED_LIB) -#define IMPORT __declspec(dllimport) +# define IMPORT __declspec(dllimport) #else -#define IMPORT +# define IMPORT #endif extern IMPORT int b(void); @@ -10,5 +10,5 @@ int main() return b(); } #ifndef REQUIRED -#error "REQUIRED needs to be defined" +# error "REQUIRED needs to be defined" #endif diff --git a/Tests/RunCMake/ObjectLibrary/requires.c b/Tests/RunCMake/ObjectLibrary/requires.c index d524952b43..685632b3d4 100644 --- a/Tests/RunCMake/ObjectLibrary/requires.c +++ b/Tests/RunCMake/ObjectLibrary/requires.c @@ -4,5 +4,5 @@ int required() return 0; } #else -#error "REQUIRED not defined" +# error "REQUIRED not defined" #endif diff --git a/Tests/RunCMake/XcodeProject/DeploymentTarget.c b/Tests/RunCMake/XcodeProject/DeploymentTarget.c index 51af046216..5e0f40fedd 100644 --- a/Tests/RunCMake/XcodeProject/DeploymentTarget.c +++ b/Tests/RunCMake/XcodeProject/DeploymentTarget.c @@ -2,23 +2,23 @@ #include <TargetConditionals.h> #if TARGET_OS_OSX -#if __MAC_OS_X_VERSION_MIN_REQUIRED != __MAC_10_11 -#error macOS deployment version mismatch -#endif +# if __MAC_OS_X_VERSION_MIN_REQUIRED != __MAC_10_11 +# error macOS deployment version mismatch +# endif #elif TARGET_OS_IOS -#if __IPHONE_OS_VERSION_MIN_REQUIRED != __IPHONE_9_1 -#error iOS deployment version mismatch -#endif +# if __IPHONE_OS_VERSION_MIN_REQUIRED != __IPHONE_9_1 +# error iOS deployment version mismatch +# endif #elif TARGET_OS_WATCH -#if __WATCH_OS_VERSION_MIN_REQUIRED != __WATCHOS_2_0 -#error watchOS deployment version mismatch -#endif +# if __WATCH_OS_VERSION_MIN_REQUIRED != __WATCHOS_2_0 +# error watchOS deployment version mismatch +# endif #elif TARGET_OS_TV -#if __TV_OS_VERSION_MIN_REQUIRED != __TVOS_9_0 -#error tvOS deployment version mismatch -#endif +# if __TV_OS_VERSION_MIN_REQUIRED != __TVOS_9_0 +# error tvOS deployment version mismatch +# endif #else -#error unknown OS +# error unknown OS #endif void foo() diff --git a/Tests/RunCMake/pseudo_cppcheck.c b/Tests/RunCMake/pseudo_cppcheck.c index 8667e5e4ab..75f3cec185 100644 --- a/Tests/RunCMake/pseudo_cppcheck.c +++ b/Tests/RunCMake/pseudo_cppcheck.c @@ -16,17 +16,21 @@ int main(int argc, char* argv[]) fprintf(stderr, "[/foo/bar.c:2]: (error) Array 'abc[10]' accessed at index 12," " which is out of bounds.\n"); - fprintf(stderr, "[/foo/bar.c:2]: (warning) Member variable 'foo::bar' is " - "not initialized in the constructor.\n"); + fprintf(stderr, + "[/foo/bar.c:2]: (warning) Member variable 'foo::bar' is " + "not initialized in the constructor.\n"); fprintf(stderr, "[/foo/bar.c:2]: (style) C-style pointer casting.\n"); - fprintf(stderr, "[/foo/bar.c:2]: (performance) Variable 'm_message' is " - "assigned in constructor body. Consider performing " - "initialization in initialization list.\n"); - fprintf(stderr, "[/foo/bar.c:2]: (portability) scanf without field width " - "limits can crash with huge input data on some versions of " - "libc\n"); - fprintf(stderr, "[/foo/bar.c:2]: (information) cannot find all the include " - "files (use --check-config for details)\n"); + fprintf(stderr, + "[/foo/bar.c:2]: (performance) Variable 'm_message' is " + "assigned in constructor body. Consider performing " + "initialization in initialization list.\n"); + fprintf(stderr, + "[/foo/bar.c:2]: (portability) scanf without field width " + "limits can crash with huge input data on some versions of " + "libc\n"); + fprintf(stderr, + "[/foo/bar.c:2]: (information) cannot find all the include " + "files (use --check-config for details)\n"); // we allow this to return 1 as we ignore it return 1; } diff --git a/Tests/RunCMake/try_compile/CStandardGNU.c b/Tests/RunCMake/try_compile/CStandardGNU.c index ac26c15e9e..f7ddff4d3d 100644 --- a/Tests/RunCMake/try_compile/CStandardGNU.c +++ b/Tests/RunCMake/try_compile/CStandardGNU.c @@ -1,8 +1,8 @@ #if __STDC_VERSION__ != 199901L -#error "Not GNU C 99 mode!" +# error "Not GNU C 99 mode!" #endif #ifndef __STRICT_ANSI__ -#error "Not GNU C strict ANSI!" +# error "Not GNU C strict ANSI!" #endif int main(void) { diff --git a/Tests/RunCMake/try_compile/CxxStandardGNU.cxx b/Tests/RunCMake/try_compile/CxxStandardGNU.cxx index 7990a78dda..ef65e26560 100644 --- a/Tests/RunCMake/try_compile/CxxStandardGNU.cxx +++ b/Tests/RunCMake/try_compile/CxxStandardGNU.cxx @@ -1,9 +1,9 @@ #if __cplusplus != 201103L && \ !(__cplusplus < 201103L && defined(__GXX_EXPERIMENTAL_CXX0X__)) -#error "Not GNU C++ 11 mode!" +# error "Not GNU C++ 11 mode!" #endif #ifndef __STRICT_ANSI__ -#error "Not GNU C++ strict ANSI!" +# error "Not GNU C++ strict ANSI!" #endif int main() { diff --git a/Tests/RunCMake/try_compile/src.c b/Tests/RunCMake/try_compile/src.c index 5e513825c7..beed9b14db 100644 --- a/Tests/RunCMake/try_compile/src.c +++ b/Tests/RunCMake/try_compile/src.c @@ -3,5 +3,5 @@ int main(void) return 0; } #ifdef PP_ERROR -#error PP_ERROR is defined +# error PP_ERROR is defined #endif diff --git a/Tests/SimpleInstall/inst.cxx b/Tests/SimpleInstall/inst.cxx index ecf061c807..7815f86ce0 100644 --- a/Tests/SimpleInstall/inst.cxx +++ b/Tests/SimpleInstall/inst.cxx @@ -1,14 +1,14 @@ #include "foo.h" #ifdef STAGE_2 -#include <foo/lib1.h> -#include <foo/lib2renamed.h> -#include <lib3.h> -#include <old/lib2.h> -#include <old/lib3.h> +# include <foo/lib1.h> +# include <foo/lib2renamed.h> +# include <lib3.h> +# include <old/lib2.h> +# include <old/lib3.h> #else -#include "lib1.h" -#include "lib2.h" +# include "lib1.h" +# include "lib2.h" #endif #include "lib4.h" diff --git a/Tests/SimpleInstall/lib2.h b/Tests/SimpleInstall/lib2.h index a3ed758fc4..044e7750d3 100644 --- a/Tests/SimpleInstall/lib2.h +++ b/Tests/SimpleInstall/lib2.h @@ -1,11 +1,11 @@ #ifdef _WIN32 -#ifdef test2_EXPORTS -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# ifdef test2_EXPORTS +# define CM_TEST_LIB_EXPORT __declspec(dllexport) +# else +# define CM_TEST_LIB_EXPORT __declspec(dllimport) +# endif #else -#define CM_TEST_LIB_EXPORT __declspec(dllimport) -#endif -#else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float Lib2Func(); diff --git a/Tests/SimpleInstall/lib3.h b/Tests/SimpleInstall/lib3.h index df11327c7b..e02bbc4c02 100644 --- a/Tests/SimpleInstall/lib3.h +++ b/Tests/SimpleInstall/lib3.h @@ -1,11 +1,11 @@ #ifdef _WIN32 -#ifdef test3_EXPORTS -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# ifdef test3_EXPORTS +# define CM_TEST_LIB_EXPORT __declspec(dllexport) +# else +# define CM_TEST_LIB_EXPORT __declspec(dllimport) +# endif #else -#define CM_TEST_LIB_EXPORT __declspec(dllimport) -#endif -#else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float Lib3Func(); diff --git a/Tests/SimpleInstall/lib4.h b/Tests/SimpleInstall/lib4.h index 71425a5c8b..e1a221e28d 100644 --- a/Tests/SimpleInstall/lib4.h +++ b/Tests/SimpleInstall/lib4.h @@ -1,11 +1,11 @@ #ifdef _WIN32 -#ifdef test4_EXPORTS -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# ifdef test4_EXPORTS +# define CM_TEST_LIB_EXPORT __declspec(dllexport) +# else +# define CM_TEST_LIB_EXPORT __declspec(dllimport) +# endif #else -#define CM_TEST_LIB_EXPORT __declspec(dllimport) -#endif -#else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float Lib4Func(); diff --git a/Tests/SimpleInstallS2/inst.cxx b/Tests/SimpleInstallS2/inst.cxx index ecf061c807..7815f86ce0 100644 --- a/Tests/SimpleInstallS2/inst.cxx +++ b/Tests/SimpleInstallS2/inst.cxx @@ -1,14 +1,14 @@ #include "foo.h" #ifdef STAGE_2 -#include <foo/lib1.h> -#include <foo/lib2renamed.h> -#include <lib3.h> -#include <old/lib2.h> -#include <old/lib3.h> +# include <foo/lib1.h> +# include <foo/lib2renamed.h> +# include <lib3.h> +# include <old/lib2.h> +# include <old/lib3.h> #else -#include "lib1.h" -#include "lib2.h" +# include "lib1.h" +# include "lib2.h" #endif #include "lib4.h" diff --git a/Tests/SimpleInstallS2/lib2.h b/Tests/SimpleInstallS2/lib2.h index a3ed758fc4..044e7750d3 100644 --- a/Tests/SimpleInstallS2/lib2.h +++ b/Tests/SimpleInstallS2/lib2.h @@ -1,11 +1,11 @@ #ifdef _WIN32 -#ifdef test2_EXPORTS -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# ifdef test2_EXPORTS +# define CM_TEST_LIB_EXPORT __declspec(dllexport) +# else +# define CM_TEST_LIB_EXPORT __declspec(dllimport) +# endif #else -#define CM_TEST_LIB_EXPORT __declspec(dllimport) -#endif -#else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float Lib2Func(); diff --git a/Tests/SimpleInstallS2/lib3.h b/Tests/SimpleInstallS2/lib3.h index df11327c7b..e02bbc4c02 100644 --- a/Tests/SimpleInstallS2/lib3.h +++ b/Tests/SimpleInstallS2/lib3.h @@ -1,11 +1,11 @@ #ifdef _WIN32 -#ifdef test3_EXPORTS -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# ifdef test3_EXPORTS +# define CM_TEST_LIB_EXPORT __declspec(dllexport) +# else +# define CM_TEST_LIB_EXPORT __declspec(dllimport) +# endif #else -#define CM_TEST_LIB_EXPORT __declspec(dllimport) -#endif -#else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float Lib3Func(); diff --git a/Tests/SimpleInstallS2/lib4.h b/Tests/SimpleInstallS2/lib4.h index 71425a5c8b..e1a221e28d 100644 --- a/Tests/SimpleInstallS2/lib4.h +++ b/Tests/SimpleInstallS2/lib4.h @@ -1,11 +1,11 @@ #ifdef _WIN32 -#ifdef test4_EXPORTS -#define CM_TEST_LIB_EXPORT __declspec(dllexport) +# ifdef test4_EXPORTS +# define CM_TEST_LIB_EXPORT __declspec(dllexport) +# else +# define CM_TEST_LIB_EXPORT __declspec(dllimport) +# endif #else -#define CM_TEST_LIB_EXPORT __declspec(dllimport) -#endif -#else -#define CM_TEST_LIB_EXPORT +# define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float Lib4Func(); diff --git a/Tests/SubDir/Executable/test.cxx b/Tests/SubDir/Executable/test.cxx index 06aed018bf..01d9280856 100644 --- a/Tests/SubDir/Executable/test.cxx +++ b/Tests/SubDir/Executable/test.cxx @@ -1,19 +1,19 @@ #include <stdio.h> #include <stdlib.h> #ifdef _WIN32 -#include <io.h> +# include <io.h> #else -#include <unistd.h> +# include <unistd.h> #endif // return true if the file exists int FileExists(const char* filename) { #ifdef _MSC_VER -#define access _access +# define access _access #endif #ifndef F_OK -#define F_OK 0 +# define F_OK 0 #endif if (access(filename, F_OK) != 0) { return false; diff --git a/Tests/SubDirSpaces/Executable Sources/test.cxx b/Tests/SubDirSpaces/Executable Sources/test.cxx index 06aed018bf..01d9280856 100644 --- a/Tests/SubDirSpaces/Executable Sources/test.cxx +++ b/Tests/SubDirSpaces/Executable Sources/test.cxx @@ -1,19 +1,19 @@ #include <stdio.h> #include <stdlib.h> #ifdef _WIN32 -#include <io.h> +# include <io.h> #else -#include <unistd.h> +# include <unistd.h> #endif // return true if the file exists int FileExists(const char* filename) { #ifdef _MSC_VER -#define access _access +# define access _access #endif #ifndef F_OK -#define F_OK 0 +# define F_OK 0 #endif if (access(filename, F_OK) != 0) { return false; diff --git a/Tests/SubDirSpaces/Executable/test.cxx b/Tests/SubDirSpaces/Executable/test.cxx index 06aed018bf..01d9280856 100644 --- a/Tests/SubDirSpaces/Executable/test.cxx +++ b/Tests/SubDirSpaces/Executable/test.cxx @@ -1,19 +1,19 @@ #include <stdio.h> #include <stdlib.h> #ifdef _WIN32 -#include <io.h> +# include <io.h> #else -#include <unistd.h> +# include <unistd.h> #endif // return true if the file exists int FileExists(const char* filename) { #ifdef _MSC_VER -#define access _access +# define access _access #endif #ifndef F_OK -#define F_OK 0 +# define F_OK 0 #endif if (access(filename, F_OK) != 0) { return false; diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c index 11dd4ff7c1..8755c0ef3c 100644 --- a/Tests/TestsWorkingDirectory/main.c +++ b/Tests/TestsWorkingDirectory/main.c @@ -3,16 +3,17 @@ #include <stdlib.h> #include <string.h> -#if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || \ - defined(__BORLANDC__) || defined(__MINGW32__)) +#if defined(_WIN32) && \ + (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || \ + defined(__MINGW32__)) -#include <direct.h> -#include <io.h> +# include <direct.h> +# include <io.h> -#if defined(__WATCOMC__) -#include <direct.h> -#define _getcwd getcwd -#endif +# if defined(__WATCOMC__) +# include <direct.h> +# define _getcwd getcwd +# endif static const char* Getcwd(char* buf, unsigned int len) { @@ -35,9 +36,9 @@ static const char* Getcwd(char* buf, unsigned int len) } #else -#include <fcntl.h> -#include <sys/types.h> -#include <unistd.h> +# include <fcntl.h> +# include <sys/types.h> +# include <unistd.h> static const char* Getcwd(char* buf, unsigned int len) { diff --git a/Tests/TryCompile/testdef.c b/Tests/TryCompile/testdef.c index b05f070d06..72301dd4e7 100644 --- a/Tests/TryCompile/testdef.c +++ b/Tests/TryCompile/testdef.c @@ -1,5 +1,5 @@ #ifndef TESTDEF -#error "TESTDEF should be defined!" +# error "TESTDEF should be defined!" #endif int main(void) { diff --git a/Tests/Tutorial/Step2/tutorial.cxx b/Tests/Tutorial/Step2/tutorial.cxx index 2fae364d44..37f6ac4567 100644 --- a/Tests/Tutorial/Step2/tutorial.cxx +++ b/Tests/Tutorial/Step2/tutorial.cxx @@ -5,7 +5,7 @@ #include <stdlib.h> #ifdef USE_MYMATH -#include "MathFunctions.h" +# include "MathFunctions.h" #endif int main(int argc, char* argv[]) diff --git a/Tests/Tutorial/Step3/tutorial.cxx b/Tests/Tutorial/Step3/tutorial.cxx index 2fae364d44..37f6ac4567 100644 --- a/Tests/Tutorial/Step3/tutorial.cxx +++ b/Tests/Tutorial/Step3/tutorial.cxx @@ -5,7 +5,7 @@ #include <stdlib.h> #ifdef USE_MYMATH -#include "MathFunctions.h" +# include "MathFunctions.h" #endif int main(int argc, char* argv[]) diff --git a/Tests/Tutorial/Step4/tutorial.cxx b/Tests/Tutorial/Step4/tutorial.cxx index 2fae364d44..37f6ac4567 100644 --- a/Tests/Tutorial/Step4/tutorial.cxx +++ b/Tests/Tutorial/Step4/tutorial.cxx @@ -5,7 +5,7 @@ #include <stdlib.h> #ifdef USE_MYMATH -#include "MathFunctions.h" +# include "MathFunctions.h" #endif int main(int argc, char* argv[]) diff --git a/Tests/Tutorial/Step5/tutorial.cxx b/Tests/Tutorial/Step5/tutorial.cxx index 2fae364d44..37f6ac4567 100644 --- a/Tests/Tutorial/Step5/tutorial.cxx +++ b/Tests/Tutorial/Step5/tutorial.cxx @@ -5,7 +5,7 @@ #include <stdlib.h> #ifdef USE_MYMATH -#include "MathFunctions.h" +# include "MathFunctions.h" #endif int main(int argc, char* argv[]) diff --git a/Tests/Tutorial/Step6/tutorial.cxx b/Tests/Tutorial/Step6/tutorial.cxx index 2fae364d44..37f6ac4567 100644 --- a/Tests/Tutorial/Step6/tutorial.cxx +++ b/Tests/Tutorial/Step6/tutorial.cxx @@ -5,7 +5,7 @@ #include <stdlib.h> #ifdef USE_MYMATH -#include "MathFunctions.h" +# include "MathFunctions.h" #endif int main(int argc, char* argv[]) diff --git a/Tests/Tutorial/Step7/tutorial.cxx b/Tests/Tutorial/Step7/tutorial.cxx index 2fae364d44..37f6ac4567 100644 --- a/Tests/Tutorial/Step7/tutorial.cxx +++ b/Tests/Tutorial/Step7/tutorial.cxx @@ -5,7 +5,7 @@ #include <stdlib.h> #ifdef USE_MYMATH -#include "MathFunctions.h" +# include "MathFunctions.h" #endif int main(int argc, char* argv[]) diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp index 8f3452c061..0662fbe64a 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp @@ -101,12 +101,12 @@ void Direct3DBase::CreateWindowSizeDependentResources() #if WINVER > 0x0602 m_orientation = DisplayInformation::GetForCurrentView()->CurrentOrientation; #else -#if PHONE +# if PHONE // WP8 doesn't support rotations so always make it landscape m_orientation = DisplayOrientations::Landscape; -#else +# else m_orientation = DisplayProperties::CurrentOrientation; -#endif +# endif #endif bool swapDimensions = m_orientation == DisplayOrientations::Portrait || m_orientation == DisplayOrientations::PortraitFlipped; diff --git a/Tests/Wrapping/fakefluid.cxx b/Tests/Wrapping/fakefluid.cxx index a118bbd435..f5fb3fb259 100644 --- a/Tests/Wrapping/fakefluid.cxx +++ b/Tests/Wrapping/fakefluid.cxx @@ -6,9 +6,10 @@ int main(int ac, char** av) if (strcmp(av[i], "-o") == 0 || strcmp(av[i], "-h") == 0) { fprintf(stdout, "fakefluid is creating file \"%s\"\n", av[i + 1]); FILE* file = fopen(av[i + 1], "w"); - fprintf(file, "// Solaris needs non-empty content so ensure\n" - "// we have at least one symbol\n" - "int Solaris_requires_a_symbol_here = 0;\n"); + fprintf(file, + "// Solaris needs non-empty content so ensure\n" + "// we have at least one symbol\n" + "int Solaris_requires_a_symbol_here = 0;\n"); fclose(file); } } diff --git a/Tests/Wrapping/qtwrappingmain.cxx b/Tests/Wrapping/qtwrappingmain.cxx index 37234d900c..d4951eef29 100644 --- a/Tests/Wrapping/qtwrappingmain.cxx +++ b/Tests/Wrapping/qtwrappingmain.cxx @@ -2,8 +2,8 @@ #include <qapplication.h> #ifndef _WIN32 -#include <stdio.h> -#include <stdlib.h> +# include <stdio.h> +# include <stdlib.h> #endif int main(int argc, char* argv[]) diff --git a/Tests/X11/HelloWorldX11.cxx b/Tests/X11/HelloWorldX11.cxx index 0863f7bb7d..e59248b49b 100644 --- a/Tests/X11/HelloWorldX11.cxx +++ b/Tests/X11/HelloWorldX11.cxx @@ -11,15 +11,15 @@ */ #ifndef MAIN_H -#define MAIN_H 1 +# define MAIN_H 1 -#include <iostream> -#include <stdlib.h> +# include <iostream> +# include <stdlib.h> /* include the X library headers */ -#include <X11/Xlib.h> -#include <X11/Xos.h> -#include <X11/Xutil.h> +# include <X11/Xlib.h> +# include <X11/Xos.h> +# include <X11/Xutil.h> class Main { diff --git a/Tests/X11/X11.c b/Tests/X11/X11.c index b802ed8b9b..3a6f9f0b35 100644 --- a/Tests/X11/X11.c +++ b/Tests/X11/X11.c @@ -1,8 +1,8 @@ #include "stdio.h" #ifdef CMAKE_HAS_X -#include <X11/Xlib.h> -#include <X11/Xutil.h> +# include <X11/Xlib.h> +# include <X11/Xutil.h> int main() { |