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

2 files changed, 26 insertions, 13 deletions

diff --git a/Tests/Module/GenerateExportHeader/libstatic/libstatic.cpp b/Tests/Module/GenerateExportHeader/libstatic/libstatic.cpp
index 0710c3e..89381af 100644
--- a/Tests/Module/GenerateExportHeader/libstatic/libstatic.cpp
+++ b/Tests/Module/GenerateExportHeader/libstatic/libstatic.cpp
@@ -16,11 +16,13 @@ int Libstatic::libstatic_deprecated() const
   return 0;
 }
 
-int Libstatic::libstatic_not_exported() const {
+int Libstatic::libstatic_not_exported() const
+{
   return 0;
 }
 
-int Libstatic::libstatic_excluded() const {
+int Libstatic::libstatic_excluded() const
+{
   return 0;
 }
 
@@ -39,11 +41,13 @@ int LibstaticNotExported::libstatic_deprecated() const
   return 0;
 }
 
-int LibstaticNotExported::libstatic_not_exported() const {
+int LibstaticNotExported::libstatic_not_exported() const
+{
   return 0;
 }
 
-int LibstaticNotExported::libstatic_excluded() const {
+int LibstaticNotExported::libstatic_excluded() const
+{
   return 0;
 }
 
@@ -62,26 +66,32 @@ int LibstaticExcluded::libstatic_deprecated() const
   return 0;
 }
 
-int LibstaticExcluded::libstatic_not_exported() const {
+int LibstaticExcluded::libstatic_not_exported() const
+{
   return 0;
 }
 
-int LibstaticExcluded::libstatic_excluded() const {
+int LibstaticExcluded::libstatic_excluded() const
+{
   return 0;
 }
 
-int libstatic_exported() {
+int libstatic_exported()
+{
   return 0;
 }
 
-int libstatic_deprecated() {
+int libstatic_deprecated()
+{
   return 0;
 }
 
-int libstatic_not_exported() {
+int libstatic_not_exported()
+{
   return 0;
 }
 
-int libstatic_excluded() {
+int libstatic_excluded()
+{
   return 0;
 }
diff --git a/Tests/Module/GenerateExportHeader/libstatic/libstatic.h b/Tests/Module/GenerateExportHeader/libstatic/libstatic.h
index cc7a35b..6072d9b 100644
--- a/Tests/Module/GenerateExportHeader/libstatic/libstatic.h
+++ b/Tests/Module/GenerateExportHeader/libstatic/libstatic.h
@@ -4,7 +4,8 @@
 
 #include "libstatic_export.h"
 
-class LIBSTATIC_EXPORT Libstatic {
+class LIBSTATIC_EXPORT Libstatic
+{
 public:
   int libstatic() const;
 
@@ -17,7 +18,8 @@ public:
   int LIBSTATIC_NO_EXPORT libstatic_excluded() const;
 };
 
-class LibstaticNotExported {
+class LibstaticNotExported
+{
 public:
   int libstatic() const;
 
@@ -30,7 +32,8 @@ public:
   int LIBSTATIC_NO_EXPORT libstatic_excluded() const;
 };
 
-class LIBSTATIC_NO_EXPORT LibstaticExcluded {
+class LIBSTATIC_NO_EXPORT LibstaticExcluded
+{
 public:
   int libstatic() const;