diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Tests/SimpleInstallS2 | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* 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/SimpleInstallS2')
-rw-r--r-- | Tests/SimpleInstallS2/TestSubDir/TSD_utils.cxx | 5 | ||||
-rw-r--r-- | Tests/SimpleInstallS2/foo.h | 1 | ||||
-rw-r--r-- | Tests/SimpleInstallS2/inst.cxx | 33 | ||||
-rw-r--r-- | Tests/SimpleInstallS2/lib2.h | 12 | ||||
-rw-r--r-- | Tests/SimpleInstallS2/lib3.h | 12 | ||||
-rw-r--r-- | Tests/SimpleInstallS2/lib4.cxx | 1 | ||||
-rw-r--r-- | Tests/SimpleInstallS2/lib4.h | 13 |
7 files changed, 35 insertions, 42 deletions
diff --git a/Tests/SimpleInstallS2/TestSubDir/TSD_utils.cxx b/Tests/SimpleInstallS2/TestSubDir/TSD_utils.cxx index 0277f05..0f32894 100644 --- a/Tests/SimpleInstallS2/TestSubDir/TSD_utils.cxx +++ b/Tests/SimpleInstallS2/TestSubDir/TSD_utils.cxx @@ -2,9 +2,8 @@ int TSD(const char* foo) { - if ( strcmp(foo, "TEST") == 0 ) - { + if (strcmp(foo, "TEST") == 0) { return 0; - } + } return 1; } diff --git a/Tests/SimpleInstallS2/foo.h b/Tests/SimpleInstallS2/foo.h index 2708baf..216cdf6 100644 --- a/Tests/SimpleInstallS2/foo.h +++ b/Tests/SimpleInstallS2/foo.h @@ -8,4 +8,3 @@ extern int SomeFunctionInFoo(); #ifdef __cplusplus } #endif - diff --git a/Tests/SimpleInstallS2/inst.cxx b/Tests/SimpleInstallS2/inst.cxx index 7f2962d..ecf061c 100644 --- a/Tests/SimpleInstallS2/inst.cxx +++ b/Tests/SimpleInstallS2/inst.cxx @@ -1,37 +1,34 @@ #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" #include <stdio.h> -int main () +int main() { - if ( Lib1Func() != 2.0 ) - { + if (Lib1Func() != 2.0) { printf("Problem with lib1\n"); return 1; - } - if ( Lib2Func() != 1.0 ) - { + } + if (Lib2Func() != 1.0) { printf("Problem with lib2\n"); return 1; - } - if ( Lib4Func() != 4.0 ) - { + } + if (Lib4Func() != 4.0) { printf("Problem with lib4\n"); return 1; - } + } printf("The value of Foo: %s\n", foo); - return SomeFunctionInFoo()-5; + return SomeFunctionInFoo() - 5; } diff --git a/Tests/SimpleInstallS2/lib2.h b/Tests/SimpleInstallS2/lib2.h index d69b786..a3ed758 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 ) -# else -# define CM_TEST_LIB_EXPORT __declspec( dllimport ) -# endif +#ifdef test2_EXPORTS +#define CM_TEST_LIB_EXPORT __declspec(dllexport) #else -# define CM_TEST_LIB_EXPORT +#define CM_TEST_LIB_EXPORT __declspec(dllimport) +#endif +#else +#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 66bc52a..df11327 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 ) -# else -# define CM_TEST_LIB_EXPORT __declspec( dllimport ) -# endif +#ifdef test3_EXPORTS +#define CM_TEST_LIB_EXPORT __declspec(dllexport) #else -# define CM_TEST_LIB_EXPORT +#define CM_TEST_LIB_EXPORT __declspec(dllimport) +#endif +#else +#define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float Lib3Func(); diff --git a/Tests/SimpleInstallS2/lib4.cxx b/Tests/SimpleInstallS2/lib4.cxx index fbfa23a..fbede5c 100644 --- a/Tests/SimpleInstallS2/lib4.cxx +++ b/Tests/SimpleInstallS2/lib4.cxx @@ -4,4 +4,3 @@ float Lib4Func() { return 4.0; } - diff --git a/Tests/SimpleInstallS2/lib4.h b/Tests/SimpleInstallS2/lib4.h index 11c1272..71425a5 100644 --- a/Tests/SimpleInstallS2/lib4.h +++ b/Tests/SimpleInstallS2/lib4.h @@ -1,12 +1,11 @@ #ifdef _WIN32 -# ifdef test4_EXPORTS -# define CM_TEST_LIB_EXPORT __declspec( dllexport ) -# else -# define CM_TEST_LIB_EXPORT __declspec( dllimport ) -# endif +#ifdef test4_EXPORTS +#define CM_TEST_LIB_EXPORT __declspec(dllexport) #else -# define CM_TEST_LIB_EXPORT +#define CM_TEST_LIB_EXPORT __declspec(dllimport) +#endif +#else +#define CM_TEST_LIB_EXPORT #endif CM_TEST_LIB_EXPORT float Lib4Func(); - |