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/Tutorial/Step7 | |
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/Tutorial/Step7')
-rw-r--r-- | Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx | 25 | ||||
-rw-r--r-- | Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx | 24 | ||||
-rw-r--r-- | Tests/Tutorial/Step7/tutorial.cxx | 21 |
3 files changed, 29 insertions, 41 deletions
diff --git a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx index a23feeb..cebd50f 100644 --- a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx +++ b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx @@ -2,34 +2,31 @@ #include <math.h> #include <stdio.h> -int main (int argc, char *argv[]) +int main(int argc, char* argv[]) { int i; double result; // make sure we have enough arguments - if (argc < 2) - { + if (argc < 2) { return 1; - } + } // open the output file - FILE *fout = fopen(argv[1],"w"); - if (!fout) - { + FILE* fout = fopen(argv[1], "w"); + if (!fout) { return 1; - } + } // create a source file with a table of square roots - fprintf(fout,"double sqrtTable[] = {\n"); - for (i = 0; i < 10; ++i) - { + fprintf(fout, "double sqrtTable[] = {\n"); + for (i = 0; i < 10; ++i) { result = sqrt(static_cast<double>(i)); - fprintf(fout,"%g,\n",result); - } + fprintf(fout, "%g,\n", result); + } // close the table with a zero - fprintf(fout,"0};\n"); + fprintf(fout, "0};\n"); fclose(fout); return 0; } diff --git a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx index a488af6..458ed63 100644 --- a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx @@ -10,10 +10,9 @@ // a hack square root calculation using simple operations double mysqrt(double x) { - if (x <= 0) - { + if (x <= 0) { return 0; - } + } double result; @@ -22,23 +21,20 @@ double mysqrt(double x) // use the table to help find an initial value result = x; - if (x >= 1 && x < 10) - { + if (x >= 1 && x < 10) { result = sqrtTable[static_cast<int>(x)]; - } + } // do ten iterations int i; - for (i = 0; i < 10; ++i) - { - if (result <= 0) - { + for (i = 0; i < 10; ++i) { + if (result <= 0) { result = 0.1; - } - delta = x - (result*result); - result = result + 0.5*delta/result; - fprintf(stdout,"Computing sqrt of %g to be %g\n",x,result); } + delta = x - (result * result); + result = result + 0.5 * delta / result; + fprintf(stdout, "Computing sqrt of %g to be %g\n", x, result); + } return result; } diff --git a/Tests/Tutorial/Step7/tutorial.cxx b/Tests/Tutorial/Step7/tutorial.cxx index af88dad..2fae364 100644 --- a/Tests/Tutorial/Step7/tutorial.cxx +++ b/Tests/Tutorial/Step7/tutorial.cxx @@ -8,31 +8,26 @@ #include "MathFunctions.h" #endif -int main (int argc, char *argv[]) +int main(int argc, char* argv[]) { - if (argc < 2) - { - fprintf(stdout,"%s Version %d.%d\n", - argv[0], - Tutorial_VERSION_MAJOR, + if (argc < 2) { + fprintf(stdout, "%s Version %d.%d\n", argv[0], Tutorial_VERSION_MAJOR, Tutorial_VERSION_MINOR); - fprintf(stdout,"Usage: %s number\n",argv[0]); + fprintf(stdout, "Usage: %s number\n", argv[0]); return 1; - } + } double inputValue = atof(argv[1]); double outputValue = 0; - if(inputValue >= 0) - { + if (inputValue >= 0) { #ifdef USE_MYMATH outputValue = mysqrt(inputValue); #else outputValue = sqrt(inputValue); #endif - } + } - fprintf(stdout,"The square root of %g is %g\n", - inputValue, outputValue); + fprintf(stdout, "The square root of %g is %g\n", inputValue, outputValue); return 0; } |