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.

6 files changed, 24 insertions, 33 deletions

diff --git a/Tests/BundleUtilities/framework.h b/Tests/BundleUtilities/framework.h
index bdd10f0..343317c 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)
-# else
-#  define FRAMEWORK_EXPORT __declspec(dllimport)
-# endif
+#ifdef framework_EXPORTS
+#define FRAMEWORK_EXPORT __declspec(dllexport)
 #else
-# define FRAMEWORK_EXPORT
+#define FRAMEWORK_EXPORT __declspec(dllimport)
+#endif
+#else
+#define FRAMEWORK_EXPORT
 #endif
 
 void FRAMEWORK_EXPORT framework();
diff --git a/Tests/BundleUtilities/shared.h b/Tests/BundleUtilities/shared.h
index 3588fb8..28904fd 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)
-# else
-#  define SHARED_EXPORT __declspec(dllimport)
-# endif
+#ifdef shared_EXPORTS
+#define SHARED_EXPORT __declspec(dllexport)
 #else
-# define SHARED_EXPORT
+#define SHARED_EXPORT __declspec(dllimport)
+#endif
+#else
+#define SHARED_EXPORT
 #endif
 
 void SHARED_EXPORT shared();
diff --git a/Tests/BundleUtilities/shared2.h b/Tests/BundleUtilities/shared2.h
index d53546c..3f0015c 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)
-# else
-#  define SHARED2_EXPORT __declspec(dllimport)
-# endif
+#ifdef shared2_EXPORTS
+#define SHARED2_EXPORT __declspec(dllexport)
 #else
-# define SHARED2_EXPORT
+#define SHARED2_EXPORT __declspec(dllimport)
+#endif
+#else
+#define SHARED2_EXPORT
 #endif
 
 void SHARED2_EXPORT shared2();
diff --git a/Tests/BundleUtilities/testbundleutils1.cpp b/Tests/BundleUtilities/testbundleutils1.cpp
index 23d3cbd..3eb6a44 100644
--- a/Tests/BundleUtilities/testbundleutils1.cpp
+++ b/Tests/BundleUtilities/testbundleutils1.cpp
@@ -16,18 +16,15 @@ int main(int, char**)
 
 #if defined(WIN32)
   HANDLE lib = LoadLibraryA("module1.dll");
-  if(!lib)
-  {
+  if (!lib) {
     printf("Failed to open module1\n");
   }
 #else
   void* lib = dlopen("module1.so", RTLD_LAZY);
-  if(!lib)
-  {
+  if (!lib) {
     printf("Failed to open module1\n%s\n", dlerror());
   }
 #endif
 
-
   return lib == 0 ? 1 : 0;
 }
diff --git a/Tests/BundleUtilities/testbundleutils2.cpp b/Tests/BundleUtilities/testbundleutils2.cpp
index 319be89..c39eb52 100644
--- a/Tests/BundleUtilities/testbundleutils2.cpp
+++ b/Tests/BundleUtilities/testbundleutils2.cpp
@@ -16,18 +16,15 @@ int main(int, char**)
 
 #if defined(WIN32)
   HANDLE lib = LoadLibraryA("module2.dll");
-  if(!lib)
-  {
+  if (!lib) {
     printf("Failed to open module2\n");
   }
 #else
   void* lib = dlopen("module2.so", RTLD_LAZY);
-  if(!lib)
-  {
+  if (!lib) {
     printf("Failed to open module2\n%s\n", dlerror());
   }
 #endif
 
-
   return lib == 0 ? 1 : 0;
 }
diff --git a/Tests/BundleUtilities/testbundleutils3.cpp b/Tests/BundleUtilities/testbundleutils3.cpp
index 9df13e9..3bc8a83 100644
--- a/Tests/BundleUtilities/testbundleutils3.cpp
+++ b/Tests/BundleUtilities/testbundleutils3.cpp
@@ -16,18 +16,15 @@ int main(int, char**)
 
 #if defined(WIN32)
   HANDLE lib = LoadLibraryA("module3.dll");
-  if(!lib)
-  {
+  if (!lib) {
     printf("Failed to open module3\n");
   }
 #else
   void* lib = dlopen("module3.so", RTLD_LAZY);
-  if(!lib)
-  {
+  if (!lib) {
     printf("Failed to open module3\n%s\n", dlerror());
   }
 #endif
 
-
   return lib == 0 ? 1 : 0;
 }