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.

26 files changed, 70 insertions, 70 deletions

diff --git a/Tests/ExportImport/Export/Interface/source_target.cpp b/Tests/ExportImport/Export/Interface/source_target.cpp
index 037191c..1eb5b13 100644
--- a/Tests/ExportImport/Export/Interface/source_target.cpp
+++ b/Tests/ExportImport/Export/Interface/source_target.cpp
@@ -1,10 +1,10 @@
 
 #ifndef USE_FROM_BUILD_DIR
-#error Expected define USE_FROM_BUILD_DIR
+#  error Expected define USE_FROM_BUILD_DIR
 #endif
 
 #ifdef USE_FROM_INSTALL_DIR
-#error Unexpected define USE_FROM_INSTALL_DIR
+#  error Unexpected define USE_FROM_INSTALL_DIR
 #endif
 
 int source_symbol()
diff --git a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
index 64514ed..2f88190 100644
--- a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
+++ b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
@@ -1,10 +1,10 @@
 
 #ifdef USE_FROM_BUILD_DIR
-#error Unexpected define USE_FROM_BUILD_DIR
+#  error Unexpected define USE_FROM_BUILD_DIR
 #endif
 
 #ifndef USE_FROM_INSTALL_DIR
-#error Expected define USE_FROM_INSTALL_DIR
+#  error Expected define USE_FROM_INSTALL_DIR
 #endif
 
 int source_symbol()
diff --git a/Tests/ExportImport/Export/systemlib.h b/Tests/ExportImport/Export/systemlib.h
index 6fd00d5..8ec055b 100644
--- a/Tests/ExportImport/Export/systemlib.h
+++ b/Tests/ExportImport/Export/systemlib.h
@@ -3,9 +3,9 @@
 #define SYSTEMLIB_H
 
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define systemlib_EXPORT __declspec(dllexport)
+#  define systemlib_EXPORT __declspec(dllexport)
 #else
-#define systemlib_EXPORT
+#  define systemlib_EXPORT
 #endif
 
 struct systemlib_EXPORT SystemStruct
diff --git a/Tests/ExportImport/Export/testExe2.c b/Tests/ExportImport/Export/testExe2.c
index f8976c4..958e4d2 100644
--- a/Tests/ExportImport/Export/testExe2.c
+++ b/Tests/ExportImport/Export/testExe2.c
@@ -1,7 +1,7 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testExe2_EXPORT __declspec(dllexport)
+#  define testExe2_EXPORT __declspec(dllexport)
 #else
-#define testExe2_EXPORT
+#  define testExe2_EXPORT
 #endif
 
 testExe2_EXPORT int testExe2Func(void)
diff --git a/Tests/ExportImport/Export/testExe2lib.c b/Tests/ExportImport/Export/testExe2lib.c
index 2a5a77b..905e6c7 100644
--- a/Tests/ExportImport/Export/testExe2lib.c
+++ b/Tests/ExportImport/Export/testExe2lib.c
@@ -1,9 +1,9 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testExe2lib_EXPORT __declspec(dllexport)
-#define testExe2libImp_IMPORT __declspec(dllimport)
+#  define testExe2lib_EXPORT __declspec(dllexport)
+#  define testExe2libImp_IMPORT __declspec(dllimport)
 #else
-#define testExe2lib_EXPORT
-#define testExe2libImp_IMPORT
+#  define testExe2lib_EXPORT
+#  define testExe2libImp_IMPORT
 #endif
 
 testExe2libImp_IMPORT int testExe2libImp(void);
diff --git a/Tests/ExportImport/Export/testExe2libImp.c b/Tests/ExportImport/Export/testExe2libImp.c
index aba914b..8892c85 100644
--- a/Tests/ExportImport/Export/testExe2libImp.c
+++ b/Tests/ExportImport/Export/testExe2libImp.c
@@ -1,7 +1,7 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testExe2libImp_EXPORT __declspec(dllexport)
+#  define testExe2libImp_EXPORT __declspec(dllexport)
 #else
-#define testExe2libImp_EXPORT
+#  define testExe2libImp_EXPORT
 #endif
 
 testExe2libImp_EXPORT int testExe2libImp(void)
diff --git a/Tests/ExportImport/Export/testLib3.c b/Tests/ExportImport/Export/testLib3.c
index cacac81..016fae0 100644
--- a/Tests/ExportImport/Export/testLib3.c
+++ b/Tests/ExportImport/Export/testLib3.c
@@ -1,9 +1,9 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testLib3_EXPORT __declspec(dllexport)
-#define testLib3Imp_IMPORT __declspec(dllimport)
+#  define testLib3_EXPORT __declspec(dllexport)
+#  define testLib3Imp_IMPORT __declspec(dllimport)
 #else
-#define testLib3_EXPORT
-#define testLib3Imp_IMPORT
+#  define testLib3_EXPORT
+#  define testLib3Imp_IMPORT
 #endif
 
 testLib3Imp_IMPORT int testLib3Imp(void);
diff --git a/Tests/ExportImport/Export/testLib3Imp.c b/Tests/ExportImport/Export/testLib3Imp.c
index 3d836da..877d0b6 100644
--- a/Tests/ExportImport/Export/testLib3Imp.c
+++ b/Tests/ExportImport/Export/testLib3Imp.c
@@ -1,9 +1,9 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testLib3Imp_EXPORT __declspec(dllexport)
-#define testLib3ImpDep_IMPORT __declspec(dllimport)
+#  define testLib3Imp_EXPORT __declspec(dllexport)
+#  define testLib3ImpDep_IMPORT __declspec(dllimport)
 #else
-#define testLib3Imp_EXPORT
-#define testLib3ImpDep_IMPORT
+#  define testLib3Imp_EXPORT
+#  define testLib3ImpDep_IMPORT
 #endif
 
 testLib3ImpDep_IMPORT int testLib3ImpDep(void);
diff --git a/Tests/ExportImport/Export/testLib3ImpDep.c b/Tests/ExportImport/Export/testLib3ImpDep.c
index b824e03..4fc9783 100644
--- a/Tests/ExportImport/Export/testLib3ImpDep.c
+++ b/Tests/ExportImport/Export/testLib3ImpDep.c
@@ -1,7 +1,7 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testLib3ImpDep_EXPORT __declspec(dllexport)
+#  define testLib3ImpDep_EXPORT __declspec(dllexport)
 #else
-#define testLib3ImpDep_EXPORT
+#  define testLib3ImpDep_EXPORT
 #endif
 
 testLib3ImpDep_EXPORT int testLib3ImpDep(void)
diff --git a/Tests/ExportImport/Export/testLib4.c b/Tests/ExportImport/Export/testLib4.c
index 0e583b1..2031a4f 100644
--- a/Tests/ExportImport/Export/testLib4.c
+++ b/Tests/ExportImport/Export/testLib4.c
@@ -1,7 +1,7 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testLib4_EXPORT __declspec(dllexport)
+#  define testLib4_EXPORT __declspec(dllexport)
 #else
-#define testLib4_EXPORT
+#  define testLib4_EXPORT
 #endif
 
 testLib4_EXPORT int testLib4(void)
diff --git a/Tests/ExportImport/Export/testLib5.c b/Tests/ExportImport/Export/testLib5.c
index 7c61fc0..edd02eb 100644
--- a/Tests/ExportImport/Export/testLib5.c
+++ b/Tests/ExportImport/Export/testLib5.c
@@ -1,7 +1,7 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testLib5_EXPORT __declspec(dllexport)
+#  define testLib5_EXPORT __declspec(dllexport)
 #else
-#define testLib5_EXPORT
+#  define testLib5_EXPORT
 #endif
 
 testLib5_EXPORT int testLib5(void)
diff --git a/Tests/ExportImport/Export/testLib9.c b/Tests/ExportImport/Export/testLib9.c
index fe8610b..2f6f8eb 100644
--- a/Tests/ExportImport/Export/testLib9.c
+++ b/Tests/ExportImport/Export/testLib9.c
@@ -1,11 +1,11 @@
 #ifndef testLib9ObjPub_USED
-#error "testLib9ObjPub_USED not defined!"
+#  error "testLib9ObjPub_USED not defined!"
 #endif
 #ifndef testLib9ObjPriv_USED
-#error "testLib9ObjPriv_USED not defined!"
+#  error "testLib9ObjPriv_USED not defined!"
 #endif
 #ifdef testLib9ObjIface_USED
-#error "testLib9ObjIface_USED defined but should not be!"
+#  error "testLib9ObjIface_USED defined but should not be!"
 #endif
 int testLib9ObjPub(void);
 int testLib9ObjPriv(void);
diff --git a/Tests/ExportImport/Export/testLibDepends.c b/Tests/ExportImport/Export/testLibDepends.c
index c896c10..6100da1 100644
--- a/Tests/ExportImport/Export/testLibDepends.c
+++ b/Tests/ExportImport/Export/testLibDepends.c
@@ -4,15 +4,15 @@
 #include "testLibIncludeRequired4.h"
 
 #ifndef testLibRequired_IFACE_DEFINE
-#error Expected testLibRequired_IFACE_DEFINE
+#  error Expected testLibRequired_IFACE_DEFINE
 #endif
 
 #ifndef BuildOnly_DEFINE
-#error Expected BuildOnly_DEFINE
+#  error Expected BuildOnly_DEFINE
 #endif
 
 #ifdef InstallOnly_DEFINE
-#error Unexpected InstallOnly_DEFINE
+#  error Unexpected InstallOnly_DEFINE
 #endif
 
 extern int testLibRequired(void);
diff --git a/Tests/ExportImport/Export/testLibNoSONAME.c b/Tests/ExportImport/Export/testLibNoSONAME.c
index 4d98562..9552848 100644
--- a/Tests/ExportImport/Export/testLibNoSONAME.c
+++ b/Tests/ExportImport/Export/testLibNoSONAME.c
@@ -1,7 +1,7 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testLibNoSONAME_EXPORT __declspec(dllexport)
+#  define testLibNoSONAME_EXPORT __declspec(dllexport)
 #else
-#define testLibNoSONAME_EXPORT
+#  define testLibNoSONAME_EXPORT
 #endif
 
 testLibNoSONAME_EXPORT int testLibNoSoName(void)
diff --git a/Tests/ExportImport/Import/A/cmp0022NEW_test.cpp b/Tests/ExportImport/Import/A/cmp0022NEW_test.cpp
index 5878349..778b828 100644
--- a/Tests/ExportImport/Import/A/cmp0022NEW_test.cpp
+++ b/Tests/ExportImport/Import/A/cmp0022NEW_test.cpp
@@ -1,9 +1,9 @@
 
 #ifndef USING_TESTLIB2
-#error Expected USING_TESTLIB2
+#  error Expected USING_TESTLIB2
 #endif
 #ifdef USING_TESTLIB3
-#error Unexpected USING_TESTLIB3
+#  error Unexpected USING_TESTLIB3
 #endif
 
 int main(void)
diff --git a/Tests/ExportImport/Import/A/cmp0022OLD_test.cpp b/Tests/ExportImport/Import/A/cmp0022OLD_test.cpp
index e50158b..9eaaee9 100644
--- a/Tests/ExportImport/Import/A/cmp0022OLD_test.cpp
+++ b/Tests/ExportImport/Import/A/cmp0022OLD_test.cpp
@@ -1,9 +1,9 @@
 
 #ifdef USING_TESTLIB2
-#error Unexpected USING_TESTLIB2
+#  error Unexpected USING_TESTLIB2
 #endif
 #ifndef USING_TESTLIB3
-#error Expected USING_TESTLIB3
+#  error Expected USING_TESTLIB3
 #endif
 
 int main(void)
diff --git a/Tests/ExportImport/Import/A/deps_iface.c b/Tests/ExportImport/Import/A/deps_iface.c
index 1539bcb..e2d973c 100644
--- a/Tests/ExportImport/Import/A/deps_iface.c
+++ b/Tests/ExportImport/Import/A/deps_iface.c
@@ -14,15 +14,15 @@
 #include "installIncludesTest8.h"
 
 #ifndef testLibRequired_IFACE_DEFINE
-#error Expected testLibRequired_IFACE_DEFINE
+#  error Expected testLibRequired_IFACE_DEFINE
 #endif
 
 #ifdef BuildOnly_DEFINE
-#error Unexpected BuildOnly_DEFINE
+#  error Unexpected BuildOnly_DEFINE
 #endif
 
 #ifndef InstallOnly_DEFINE
-#error Expected InstallOnly_DEFINE
+#  error Expected InstallOnly_DEFINE
 #endif
 
 extern int testLibDepends(void);
diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
index 3658ab5..d239fb4 100644
--- a/Tests/ExportImport/Import/A/deps_shared_iface.cpp
+++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
@@ -3,32 +3,32 @@
 #include "testSharedLibDepends.h"
 
 #ifdef CHECK_PIC_WORKS
-#if defined(__ELF__) && !defined(__PIC__) && !defined(__PIE__)
-#error Expected by INTERFACE_POSITION_INDEPENDENT_CODE property of dependency
-#endif
+#  if defined(__ELF__) && !defined(__PIC__) && !defined(__PIE__)
+#    error Expected by INTERFACE_POSITION_INDEPENDENT_CODE property of dependency
+#  endif
 #endif
 
 #ifndef PIC_PROPERTY_IS_ON
-#error Expected PIC_PROPERTY_IS_ON
+#  error Expected PIC_PROPERTY_IS_ON
 #endif
 
 #ifndef CUSTOM_PROPERTY_IS_ON
-#error Expected CUSTOM_PROPERTY_IS_ON
+#  error Expected CUSTOM_PROPERTY_IS_ON
 #endif
 
 #ifndef CUSTOM_STRING_IS_MATCH
-#error Expected CUSTOM_STRING_IS_MATCH
+#  error Expected CUSTOM_STRING_IS_MATCH
 #endif
 
 #ifdef TEST_SUBDIR_LIB
-#include "renamed.h"
-#include "subdir.h"
+#  include "renamed.h"
+#  include "subdir.h"
 #endif
 
 #ifdef DO_GNU_TESTS
-#ifndef CUSTOM_COMPILE_OPTION
-#error Expected CUSTOM_COMPILE_OPTION
-#endif
+#  ifndef CUSTOM_COMPILE_OPTION
+#    error Expected CUSTOM_COMPILE_OPTION
+#  endif
 #endif
 
 int main(int, char**)
diff --git a/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp b/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp
index 357f64f..ddb8c4b 100644
--- a/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp
+++ b/Tests/ExportImport/Import/A/framework_interface/framework_test.cpp
@@ -2,5 +2,5 @@
 #include <testLib4/testLib4.h>
 
 #ifndef TESTLIB4_H
-#error Expected define TESTLIB4_H
+#  error Expected define TESTLIB4_H
 #endif
diff --git a/Tests/ExportImport/Import/A/iface_test.cpp b/Tests/ExportImport/Import/A/iface_test.cpp
index fa4474b..4428c1c 100644
--- a/Tests/ExportImport/Import/A/iface_test.cpp
+++ b/Tests/ExportImport/Import/A/iface_test.cpp
@@ -1,6 +1,6 @@
 
 #ifndef USING_TESTSHAREDLIBREQUIRED
-#error Expected USING_TESTSHAREDLIBREQUIRED
+#  error Expected USING_TESTSHAREDLIBREQUIRED
 #endif
 
 #include "excludedFromAll.h"
diff --git a/Tests/ExportImport/Import/A/imp_mod1.c b/Tests/ExportImport/Import/A/imp_mod1.c
index 89d7545..9385d55 100644
--- a/Tests/ExportImport/Import/A/imp_mod1.c
+++ b/Tests/ExportImport/Import/A/imp_mod1.c
@@ -1,7 +1,7 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define testExe2_IMPORT __declspec(dllimport)
+#  define testExe2_IMPORT __declspec(dllimport)
 #else
-#define testExe2_IMPORT
+#  define testExe2_IMPORT
 #endif
 
 testExe2_IMPORT int testExe2Func(void);
diff --git a/Tests/ExportImport/Import/A/imp_testExe1.c b/Tests/ExportImport/Import/A/imp_testExe1.c
index 3488439..8173557 100644
--- a/Tests/ExportImport/Import/A/imp_testExe1.c
+++ b/Tests/ExportImport/Import/A/imp_testExe1.c
@@ -14,9 +14,9 @@ extern int testLibPerConfigDest(void);
 /* Switch a symbol between debug and optimized builds to make sure the
    proper library is found from the testLib4 link interface.  */
 #ifdef EXE_DBG
-#define testLib4libcfg testLib4libdbg
+#  define testLib4libcfg testLib4libdbg
 #else
-#define testLib4libcfg testLib4libopt
+#  define testLib4libcfg testLib4libopt
 #endif
 extern testLib4libcfg(void);
 
diff --git a/Tests/ExportImport/Import/A/imp_testExeAbs1.c b/Tests/ExportImport/Import/A/imp_testExeAbs1.c
index 629b891..fd05242 100644
--- a/Tests/ExportImport/Import/A/imp_testExeAbs1.c
+++ b/Tests/ExportImport/Import/A/imp_testExeAbs1.c
@@ -2,10 +2,10 @@
 #include "testLibAbs1a.h"
 #include "testLibAbs1b.h"
 #ifndef testLibAbs1a
-#error "testLibAbs1a not defined"
+#  error "testLibAbs1a not defined"
 #endif
 #ifndef testLibAbs1b
-#error "testLibAbs1b not defined"
+#  error "testLibAbs1b not defined"
 #endif
 int main()
 {
diff --git a/Tests/ExportImport/Import/A/imp_testLib9.c b/Tests/ExportImport/Import/A/imp_testLib9.c
index f9c05fd..e014857 100644
--- a/Tests/ExportImport/Import/A/imp_testLib9.c
+++ b/Tests/ExportImport/Import/A/imp_testLib9.c
@@ -1,11 +1,11 @@
 #ifndef testLib9ObjPub_USED
-#error "testLib9ObjPub_USED not defined!"
+#  error "testLib9ObjPub_USED not defined!"
 #endif
 #ifdef testLib9ObjPriv_USED
-#error "testLib9ObjPriv_USED defined but should not be!"
+#  error "testLib9ObjPriv_USED defined but should not be!"
 #endif
 #ifndef testLib9ObjIface_USED
-#error "testLib9ObjIface_USED not defined!"
+#  error "testLib9ObjIface_USED not defined!"
 #endif
 
 int testLib9(void);
diff --git a/Tests/ExportImport/Import/Interface/headeronlytest.cpp b/Tests/ExportImport/Import/Interface/headeronlytest.cpp
index 0e754e9..7b63a04 100644
--- a/Tests/ExportImport/Import/Interface/headeronlytest.cpp
+++ b/Tests/ExportImport/Import/Interface/headeronlytest.cpp
@@ -2,11 +2,11 @@
 #include "headeronly.h"
 
 #ifndef HEADERONLY_DEFINE
-#error Expected HEADERONLY_DEFINE
+#  error Expected HEADERONLY_DEFINE
 #endif
 
 #ifdef SHAREDLIB_DEFINE
-#error Unexpected SHAREDLIB_DEFINE
+#  error Unexpected SHAREDLIB_DEFINE
 #endif
 
 int main(int, char**)
diff --git a/Tests/ExportImport/Import/Interface/interfacetest.cpp b/Tests/ExportImport/Import/Interface/interfacetest.cpp
index 7be8162..c1e29c2 100644
--- a/Tests/ExportImport/Import/Interface/interfacetest.cpp
+++ b/Tests/ExportImport/Import/Interface/interfacetest.cpp
@@ -2,15 +2,15 @@
 #include "sharedlib.h"
 
 #ifndef SHAREDLIB_DEFINE
-#error Expected SHAREDLIB_DEFINE
+#  error Expected SHAREDLIB_DEFINE
 #endif
 
 #ifdef HEADERONLY_DEFINE
-#error Unexpected HEADERONLY_DEFINE
+#  error Unexpected HEADERONLY_DEFINE
 #endif
 
 #ifndef DEFINE_IFACE_DEFINE
-#error Expected DEFINE_IFACE_DEFINE
+#  error Expected DEFINE_IFACE_DEFINE
 #endif
 
 int main(int, char**)