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

3 files changed, 18 insertions, 17 deletions

diff --git a/Tests/GeneratorExpression/CMP0044/cmp0044-check.cpp b/Tests/GeneratorExpression/CMP0044/cmp0044-check.cpp
index 2356bc4..233eb57 100644
--- a/Tests/GeneratorExpression/CMP0044/cmp0044-check.cpp
+++ b/Tests/GeneratorExpression/CMP0044/cmp0044-check.cpp
@@ -1,20 +1,20 @@
 
 #ifdef Type_Is_
-#  if !Result
-#    error Result should be 1 in WARN mode
-#  endif
+#if !Result
+#error Result should be 1 in WARN mode
+#endif
 #endif
 
 #ifdef Type_Is_NEW
-#  if Result
-#    error Result should be 0 in NEW mode
-#  endif
+#if Result
+#error Result should be 0 in NEW mode
+#endif
 #endif
 
 #ifdef Type_Is_OLD
-#  if !Result
-#    error Result should be 1 in OLD mode
-#  endif
+#if !Result
+#error Result should be 1 in OLD mode
+#endif
 #endif
 
 #if !defined(Type_Is_) && !defined(Type_Is_OLD) && !defined(Type_Is_NEW)
diff --git a/Tests/GeneratorExpression/empty.cpp b/Tests/GeneratorExpression/empty.cpp
index f8732a4..7be1ca5 100644
--- a/Tests/GeneratorExpression/empty.cpp
+++ b/Tests/GeneratorExpression/empty.cpp
@@ -1,4 +1,7 @@
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
-int main() { return 0; }
+  int main()
+{
+  return 0;
+}
diff --git a/Tests/GeneratorExpression/pwd.c b/Tests/GeneratorExpression/pwd.c
index 054b1af..ed23043 100644
--- a/Tests/GeneratorExpression/pwd.c
+++ b/Tests/GeneratorExpression/pwd.c
@@ -15,19 +15,17 @@ int main(int argc, char* argv[])
 #define BUFSZ 20000
   char buf[BUFSZ + 1];
 #ifdef _WIN32
-  char *pos;
+  char* pos;
 #endif
   getcurdir(buf, BUFSZ);
 #ifdef _WIN32
   pos = buf;
-  while (*pos)
-    {
-    if (*pos == '\\')
-      {
+  while (*pos) {
+    if (*pos == '\\') {
       *pos = '/';
-      }
-    ++pos;
     }
+    ++pos;
+  }
 #endif
   printf("%s\n", buf);
   return EXIT_SUCCESS;