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/BuildDepends | |
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/BuildDepends')
-rw-r--r-- | Tests/BuildDepends/Project/bar.cxx | 5 | ||||
-rw-r--r-- | Tests/BuildDepends/Project/generator.cxx | 17 | ||||
-rw-r--r-- | Tests/BuildDepends/Project/link_depends_no_shared_exe.c | 2 | ||||
-rw-r--r-- | Tests/BuildDepends/Project/link_depends_no_shared_lib.c | 2 | ||||
-rw-r--r-- | Tests/BuildDepends/Project/ninjadep.cpp | 3 | ||||
-rw-r--r-- | Tests/BuildDepends/Project/object_depends.cxx | 5 | ||||
-rw-r--r-- | Tests/BuildDepends/Project/zot.cxx | 4 |
7 files changed, 18 insertions, 20 deletions
diff --git a/Tests/BuildDepends/Project/bar.cxx b/Tests/BuildDepends/Project/bar.cxx index c4adbf8..ec7aa65 100644 --- a/Tests/BuildDepends/Project/bar.cxx +++ b/Tests/BuildDepends/Project/bar.cxx @@ -6,11 +6,10 @@ int main(int argc, char** argv) { /* Make sure the noregen header was not regenerated. */ - if(strcmp("foo", noregen_string) != 0) - { + if (strcmp("foo", noregen_string) != 0) { printf("FAILED: noregen.h was regenerated!\n"); return 1; - } + } /* Print out the string that should have been regenerated. */ printf("%s\n", regen_string); diff --git a/Tests/BuildDepends/Project/generator.cxx b/Tests/BuildDepends/Project/generator.cxx index 92a122d..5a83a7f 100644 --- a/Tests/BuildDepends/Project/generator.cxx +++ b/Tests/BuildDepends/Project/generator.cxx @@ -4,21 +4,16 @@ extern const char* foo(); int main(int argc, const char* argv[]) { - if(argc < 3) - { + if (argc < 3) { fprintf(stderr, "Must specify output file and symbol prefix!"); return 1; - } - if(FILE* fout = fopen(argv[1], "w")) - { - fprintf(fout, "static const char* %s_string = \"%s\";\n", argv[2], - foo()); + } + if (FILE* fout = fopen(argv[1], "w")) { + fprintf(fout, "static const char* %s_string = \"%s\";\n", argv[2], foo()); fclose(fout); - } - else - { + } else { fprintf(stderr, "Could not open output file \"%s\"", argv[1]); return 1; - } + } return 0; } diff --git a/Tests/BuildDepends/Project/link_depends_no_shared_exe.c b/Tests/BuildDepends/Project/link_depends_no_shared_exe.c index e9113a2..cfaf051 100644 --- a/Tests/BuildDepends/Project/link_depends_no_shared_exe.c +++ b/Tests/BuildDepends/Project/link_depends_no_shared_exe.c @@ -2,7 +2,7 @@ #ifdef _WIN32 __declspec(dllimport) #endif -int link_depends_no_shared_lib(void); + int link_depends_no_shared_lib(void); int main() { return link_depends_no_shared_lib() + link_depends_no_shared_exe_value; diff --git a/Tests/BuildDepends/Project/link_depends_no_shared_lib.c b/Tests/BuildDepends/Project/link_depends_no_shared_lib.c index d226289..d66c636 100644 --- a/Tests/BuildDepends/Project/link_depends_no_shared_lib.c +++ b/Tests/BuildDepends/Project/link_depends_no_shared_lib.c @@ -2,7 +2,7 @@ #ifdef _WIN32 __declspec(dllexport) #endif -int link_depends_no_shared_lib(void) + int link_depends_no_shared_lib(void) { return link_depends_no_shared_lib_value; } diff --git a/Tests/BuildDepends/Project/ninjadep.cpp b/Tests/BuildDepends/Project/ninjadep.cpp index 5498b17..e794448 100644 --- a/Tests/BuildDepends/Project/ninjadep.cpp +++ b/Tests/BuildDepends/Project/ninjadep.cpp @@ -1,6 +1,7 @@ #include "dir/header.h" #include <stdio.h> -int main() { +int main() +{ printf("HEADER_STRING: %s\n", HEADER_STRING); } diff --git a/Tests/BuildDepends/Project/object_depends.cxx b/Tests/BuildDepends/Project/object_depends.cxx index 76e8197..f8b643a 100644 --- a/Tests/BuildDepends/Project/object_depends.cxx +++ b/Tests/BuildDepends/Project/object_depends.cxx @@ -1 +1,4 @@ -int main() { return 0; } +int main() +{ + return 0; +} diff --git a/Tests/BuildDepends/Project/zot.cxx b/Tests/BuildDepends/Project/zot.cxx index 186554b..faee7d3 100644 --- a/Tests/BuildDepends/Project/zot.cxx +++ b/Tests/BuildDepends/Project/zot.cxx @@ -7,8 +7,8 @@ const char* zot_macro_tgt_f(); int main() { - printf("[%s] [%s] [%s] [%s]\n", zot, zot_custom, - zot_macro_dir_f(), zot_macro_tgt_f()); + printf("[%s] [%s] [%s] [%s]\n", zot, zot_custom, zot_macro_dir_f(), + zot_macro_tgt_f()); fflush(stdout); return 0; } |