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

1 files changed, 17 insertions, 25 deletions

diff --git a/Tests/Module/GenerateExportHeader/exportheader_test.cpp b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
index 7802c43..26bea7e 100644
--- a/Tests/Module/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
@@ -20,21 +20,18 @@ void compare(const char* refName, const char* testName)
 {
   std::ifstream ref;
   ref.open(refName);
-  if (!ref.is_open())
-    {
+  if (!ref.is_open()) {
     std::cout << "Could not open \"" << refName << "\"." << std::endl;
     exit(1);
-    }
+  }
   std::ifstream test;
   test.open(testName);
-  if (!test.is_open())
-    {
+  if (!test.is_open()) {
     std::cout << "Could not open \"" << testName << "\"." << std::endl;
     exit(1);
-    }
+  }
 
-  while (!ref.eof() && !test.eof())
-    {
+  while (!ref.eof() && !test.eof()) {
     std::string refLine;
     std::string testLine;
     std::getline(ref, refLine);
@@ -42,31 +39,26 @@ void compare(const char* refName, const char* testName)
     // Some very old Borland runtimes (C++ Builder 5 WITHOUT Update 1) add a
     // trailing null to the string that we need to strip before testing for a
     // trailing space.
-    if (refLine.size() && refLine[refLine.size()-1] == 0)
-      {
+    if (refLine.size() && refLine[refLine.size() - 1] == 0) {
       refLine = refLine.substr(0, refLine.size() - 1);
-      }
-    if (testLine.size() && testLine[testLine.size()-1] == 0)
-      {
+    }
+    if (testLine.size() && testLine[testLine.size() - 1] == 0) {
       testLine = testLine.substr(0, testLine.size() - 1);
-      }
+    }
     // The reference files never have trailing spaces:
-    if (testLine.size() && testLine[testLine.size()-1] == ' ')
-      {
+    if (testLine.size() && testLine[testLine.size() - 1] == ' ') {
       testLine = testLine.substr(0, testLine.size() - 1);
-      }
-    if (refLine != testLine)
-      {
-      std::cout << "Ref and test are not the same:\n  Ref:  \""
-                          << refLine << "\"\n  Test: \"" << testLine << "\"\n";
+    }
+    if (refLine != testLine) {
+      std::cout << "Ref and test are not the same:\n  Ref:  \"" << refLine
+                << "\"\n  Test: \"" << testLine << "\"\n";
       exit(1);
-      }
     }
-  if (!ref.eof() || !test.eof())
-    {
+  }
+  if (!ref.eof() || !test.eof()) {
     std::cout << "Ref and test have differing numbers of lines.";
     exit(1);
-    }
+  }
 }
 
 int main()