Revise C++ coding style using clang-format-6.0

Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`.  Use `clang-format` version 6.0.

* 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.

6 files changed, 24 insertions, 24 deletions

diff --git a/Tests/BundleUtilities/framework.h b/Tests/BundleUtilities/framework.h
index 343317c..5a3cfc4 100644
--- a/Tests/BundleUtilities/framework.h
+++ b/Tests/BundleUtilities/framework.h
@@ -3,13 +3,13 @@
 #define framework_h
 
 #ifdef WIN32
-#ifdef framework_EXPORTS
-#define FRAMEWORK_EXPORT __declspec(dllexport)
+#  ifdef framework_EXPORTS
+#    define FRAMEWORK_EXPORT __declspec(dllexport)
+#  else
+#    define FRAMEWORK_EXPORT __declspec(dllimport)
+#  endif
 #else
-#define FRAMEWORK_EXPORT __declspec(dllimport)
-#endif
-#else
-#define FRAMEWORK_EXPORT
+#  define FRAMEWORK_EXPORT
 #endif
 
 void FRAMEWORK_EXPORT framework();
diff --git a/Tests/BundleUtilities/shared.h b/Tests/BundleUtilities/shared.h
index 28904fd..5d5b633 100644
--- a/Tests/BundleUtilities/shared.h
+++ b/Tests/BundleUtilities/shared.h
@@ -3,13 +3,13 @@
 #define shared_h
 
 #ifdef WIN32
-#ifdef shared_EXPORTS
-#define SHARED_EXPORT __declspec(dllexport)
+#  ifdef shared_EXPORTS
+#    define SHARED_EXPORT __declspec(dllexport)
+#  else
+#    define SHARED_EXPORT __declspec(dllimport)
+#  endif
 #else
-#define SHARED_EXPORT __declspec(dllimport)
-#endif
-#else
-#define SHARED_EXPORT
+#  define SHARED_EXPORT
 #endif
 
 void SHARED_EXPORT shared();
diff --git a/Tests/BundleUtilities/shared2.h b/Tests/BundleUtilities/shared2.h
index 3f0015c..3f016c8 100644
--- a/Tests/BundleUtilities/shared2.h
+++ b/Tests/BundleUtilities/shared2.h
@@ -3,13 +3,13 @@
 #define shared2_h
 
 #ifdef WIN32
-#ifdef shared2_EXPORTS
-#define SHARED2_EXPORT __declspec(dllexport)
+#  ifdef shared2_EXPORTS
+#    define SHARED2_EXPORT __declspec(dllexport)
+#  else
+#    define SHARED2_EXPORT __declspec(dllimport)
+#  endif
 #else
-#define SHARED2_EXPORT __declspec(dllimport)
-#endif
-#else
-#define SHARED2_EXPORT
+#  define SHARED2_EXPORT
 #endif
 
 void SHARED2_EXPORT shared2();
diff --git a/Tests/BundleUtilities/testbundleutils1.cpp b/Tests/BundleUtilities/testbundleutils1.cpp
index 3eb6a44..080157a 100644
--- a/Tests/BundleUtilities/testbundleutils1.cpp
+++ b/Tests/BundleUtilities/testbundleutils1.cpp
@@ -4,9 +4,9 @@
 #include "stdio.h"
 
 #if defined(WIN32)
-#include <windows.h>
+#  include <windows.h>
 #else
-#include "dlfcn.h"
+#  include "dlfcn.h"
 #endif
 
 int main(int, char**)
diff --git a/Tests/BundleUtilities/testbundleutils2.cpp b/Tests/BundleUtilities/testbundleutils2.cpp
index c39eb52..e747544 100644
--- a/Tests/BundleUtilities/testbundleutils2.cpp
+++ b/Tests/BundleUtilities/testbundleutils2.cpp
@@ -4,9 +4,9 @@
 #include "stdio.h"
 
 #if defined(WIN32)
-#include <windows.h>
+#  include <windows.h>
 #else
-#include "dlfcn.h"
+#  include "dlfcn.h"
 #endif
 
 int main(int, char**)
diff --git a/Tests/BundleUtilities/testbundleutils3.cpp b/Tests/BundleUtilities/testbundleutils3.cpp
index 3bc8a83..2dee46f 100644
--- a/Tests/BundleUtilities/testbundleutils3.cpp
+++ b/Tests/BundleUtilities/testbundleutils3.cpp
@@ -4,9 +4,9 @@
 #include "stdio.h"
 
 #if defined(WIN32)
-#include <windows.h>
+#  include <windows.h>
 #else
-#include "dlfcn.h"
+#  include "dlfcn.h"
 #endif
 
 int main(int, char**)