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/ExportImport/Import | |
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/ExportImport/Import')
-rw-r--r-- | Tests/ExportImport/Import/A/deps_iface.c | 1 | ||||
-rw-r--r-- | Tests/ExportImport/Import/A/deps_shared_iface.cpp | 6 | ||||
-rw-r--r-- | Tests/ExportImport/Import/A/imp_mod1.c | 4 | ||||
-rw-r--r-- | Tests/ExportImport/Import/A/imp_testExe1.c | 12 | ||||
-rw-r--r-- | Tests/ExportImport/Import/A/imp_testExeAbs1.c | 8 | ||||
-rw-r--r-- | Tests/ExportImport/Import/A/renamed_test.cpp | 2 | ||||
-rw-r--r-- | Tests/ExportImport/Import/Interface/headeronlytest.cpp | 3 | ||||
-rw-r--r-- | Tests/ExportImport/Import/Interface/interfacetest.cpp | 2 |
8 files changed, 17 insertions, 21 deletions
diff --git a/Tests/ExportImport/Import/A/deps_iface.c b/Tests/ExportImport/Import/A/deps_iface.c index 953d0ad..1539bcb 100644 --- a/Tests/ExportImport/Import/A/deps_iface.c +++ b/Tests/ExportImport/Import/A/deps_iface.c @@ -27,7 +27,6 @@ extern int testLibDepends(void); - int main() { return testLibDepends(); diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp index 0c5cb7f..3658ab5 100644 --- a/Tests/ExportImport/Import/A/deps_shared_iface.cpp +++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp @@ -31,7 +31,7 @@ #endif #endif -int main(int,char **) +int main(int, char**) { TestSharedLibDepends dep; TestSharedLibRequired req; @@ -43,7 +43,7 @@ int main(int,char **) return dep.foo() + req.foo() #ifdef TEST_SUBDIR_LIB - + sdo.foo() + ren.foo() + + sdo.foo() + ren.foo() #endif - ; + ; } diff --git a/Tests/ExportImport/Import/A/imp_mod1.c b/Tests/ExportImport/Import/A/imp_mod1.c index 579d949..89d7545 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 0a74309..83a9bb5 100644 --- a/Tests/ExportImport/Import/A/imp_testExe1.c +++ b/Tests/ExportImport/Import/A/imp_testExe1.c @@ -14,16 +14,16 @@ extern int testLibPerConfigDest(); /* 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); int main() { - return (testLib2() + generated_by_testExe1() + testLib3() + testLib4() - + testLib5() + testLib6() + testLib7() + testLibCycleA1() - + testLibPerConfigDest() - + generated_by_testExe3() + generated_by_testExe4() + testLib4lib() + testLib4libcfg()); + return (testLib2() + generated_by_testExe1() + testLib3() + testLib4() + + testLib5() + testLib6() + testLib7() + testLibCycleA1() + + testLibPerConfigDest() + generated_by_testExe3() + + generated_by_testExe4() + testLib4lib() + testLib4libcfg()); } diff --git a/Tests/ExportImport/Import/A/imp_testExeAbs1.c b/Tests/ExportImport/Import/A/imp_testExeAbs1.c index 069c3f0..629b891 100644 --- a/Tests/ExportImport/Import/A/imp_testExeAbs1.c +++ b/Tests/ExportImport/Import/A/imp_testExeAbs1.c @@ -2,14 +2,12 @@ #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() { - return 0 - + testLibAbs1() - ; + return 0 + testLibAbs1(); } diff --git a/Tests/ExportImport/Import/A/renamed_test.cpp b/Tests/ExportImport/Import/A/renamed_test.cpp index e2ee126..60d6cf9 100644 --- a/Tests/ExportImport/Import/A/renamed_test.cpp +++ b/Tests/ExportImport/Import/A/renamed_test.cpp @@ -1,7 +1,7 @@ #include "renamed.h" -int main(int, char **) +int main(int, char**) { Renamed ren; return ren.foo(); diff --git a/Tests/ExportImport/Import/Interface/headeronlytest.cpp b/Tests/ExportImport/Import/Interface/headeronlytest.cpp index 20674a7..0e754e9 100644 --- a/Tests/ExportImport/Import/Interface/headeronlytest.cpp +++ b/Tests/ExportImport/Import/Interface/headeronlytest.cpp @@ -9,8 +9,7 @@ #error Unexpected SHAREDLIB_DEFINE #endif - -int main(int,char**) +int main(int, char**) { HeaderOnly ho; return ho.foo(); diff --git a/Tests/ExportImport/Import/Interface/interfacetest.cpp b/Tests/ExportImport/Import/Interface/interfacetest.cpp index 786458d..7be8162 100644 --- a/Tests/ExportImport/Import/Interface/interfacetest.cpp +++ b/Tests/ExportImport/Import/Interface/interfacetest.cpp @@ -13,7 +13,7 @@ #error Expected DEFINE_IFACE_DEFINE #endif -int main(int,char**) +int main(int, char**) { SharedLibObject slo; return slo.foo(); |