Merge topic 'clang-format-source'

d9fd2f54 Revise C++ coding style using clang-format
82df6dea Empty commit at end of history preceding clang-format style transition
6a13f43f CONTRIBUTING: Add a section on coding style
bf451d9f Add a script to run clang-format on the entire source tree
1e90d78f Configure clang-format for CMake source tree
da60adc3 Tell Git to use a distinct conflict marker size in `.rst` files

2 files changed, 22 insertions, 36 deletions

diff --git a/Tests/SubDirSpaces/Executable Sources/test.cxx b/Tests/SubDirSpaces/Executable Sources/test.cxx
index c528fb1..06aed01 100644
--- a/Tests/SubDirSpaces/Executable Sources/test.cxx
+++ b/Tests/SubDirSpaces/Executable Sources/test.cxx
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include  <stdlib.h>
+#include <stdlib.h>
 #ifdef _WIN32
 #include <io.h>
 #else
@@ -10,39 +10,32 @@
 int FileExists(const char* filename)
 {
 #ifdef _MSC_VER
-# define access _access
+#define access _access
 #endif
 #ifndef F_OK
 #define F_OK 0
 #endif
-  if ( access(filename, F_OK) != 0 )
-    {
+  if (access(filename, F_OK) != 0) {
     return false;
-    }
-  else
-    {
+  } else {
     return true;
-    }
+  }
 }
 
-
 int main(int ac, char** av)
 {
-  if(ac <= 1)
-    {
+  if (ac <= 1) {
     printf("Usage: %s <file>\n", av[0]);
     return 1;
-    }
-  if(!FileExists(av[1]))
-    {
+  }
+  if (!FileExists(av[1])) {
     printf("Missing file %s\n", av[1]);
     return 1;
-    }
-  if(FileExists(av[2]))
-    {
+  }
+  if (FileExists(av[2])) {
     printf("File %s should be in subdirectory\n", av[2]);
     return 1;
-    }
+  }
   printf("%s is not there! Good.", av[2]);
   printf("%s is there! Good.", av[1]);
   return 0;
diff --git a/Tests/SubDirSpaces/Executable/test.cxx b/Tests/SubDirSpaces/Executable/test.cxx
index c528fb1..06aed01 100644
--- a/Tests/SubDirSpaces/Executable/test.cxx
+++ b/Tests/SubDirSpaces/Executable/test.cxx
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include  <stdlib.h>
+#include <stdlib.h>
 #ifdef _WIN32
 #include <io.h>
 #else
@@ -10,39 +10,32 @@
 int FileExists(const char* filename)
 {
 #ifdef _MSC_VER
-# define access _access
+#define access _access
 #endif
 #ifndef F_OK
 #define F_OK 0
 #endif
-  if ( access(filename, F_OK) != 0 )
-    {
+  if (access(filename, F_OK) != 0) {
     return false;
-    }
-  else
-    {
+  } else {
     return true;
-    }
+  }
 }
 
-
 int main(int ac, char** av)
 {
-  if(ac <= 1)
-    {
+  if (ac <= 1) {
     printf("Usage: %s <file>\n", av[0]);
     return 1;
-    }
-  if(!FileExists(av[1]))
-    {
+  }
+  if (!FileExists(av[1])) {
     printf("Missing file %s\n", av[1]);
     return 1;
-    }
-  if(FileExists(av[2]))
-    {
+  }
+  if (FileExists(av[2])) {
     printf("File %s should be in subdirectory\n", av[2]);
     return 1;
-    }
+  }
   printf("%s is not there! Good.", av[2]);
   printf("%s is there! Good.", av[1]);
   return 0;