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, 28 insertions, 14 deletions

diff --git a/Tests/Module/GenerateExportHeader/libshared/libshared.cpp b/Tests/Module/GenerateExportHeader/libshared/libshared.cpp
index d4041b3..ad6d356 100644
--- a/Tests/Module/GenerateExportHeader/libshared/libshared.cpp
+++ b/Tests/Module/GenerateExportHeader/libshared/libshared.cpp
@@ -16,11 +16,13 @@ int Libshared::libshared_deprecated() const
   return 0;
 }
 
-int Libshared::libshared_not_exported() const {
+int Libshared::libshared_not_exported() const
+{
   return 0;
 }
 
-int Libshared::libshared_excluded() const {
+int Libshared::libshared_excluded() const
+{
   return 0;
 }
 
@@ -39,11 +41,13 @@ int LibsharedNotExported::libshared_deprecated() const
   return 0;
 }
 
-int LibsharedNotExported::libshared_not_exported() const {
+int LibsharedNotExported::libshared_not_exported() const
+{
   return 0;
 }
 
-int LibsharedNotExported::libshared_excluded() const {
+int LibsharedNotExported::libshared_excluded() const
+{
   return 0;
 }
 
@@ -62,30 +66,37 @@ int LibsharedExcluded::libshared_deprecated() const
   return 0;
 }
 
-int LibsharedExcluded::libshared_not_exported() const {
+int LibsharedExcluded::libshared_not_exported() const
+{
   return 0;
 }
 
-int LibsharedExcluded::libshared_excluded() const {
+int LibsharedExcluded::libshared_excluded() const
+{
   return 0;
 }
 
-int libshared() {
+int libshared()
+{
   return 0;
 }
 
-int libshared_exported() {
+int libshared_exported()
+{
   return 0;
 }
 
-int libshared_deprecated() {
+int libshared_deprecated()
+{
   return 0;
 }
 
-int libshared_not_exported() {
+int libshared_not_exported()
+{
   return 0;
 }
 
-int libshared_excluded() {
+int libshared_excluded()
+{
   return 0;
 }
diff --git a/Tests/Module/GenerateExportHeader/libshared/libshared.h b/Tests/Module/GenerateExportHeader/libshared/libshared.h
index 3d9bbff..bd9f2e3 100644
--- a/Tests/Module/GenerateExportHeader/libshared/libshared.h
+++ b/Tests/Module/GenerateExportHeader/libshared/libshared.h
@@ -4,7 +4,8 @@
 
 #include "libshared_export.h"
 
-class LIBSHARED_EXPORT Libshared {
+class LIBSHARED_EXPORT Libshared
+{
 public:
   int libshared() const;
 
@@ -17,7 +18,8 @@ public:
   int LIBSHARED_NO_EXPORT libshared_excluded() const;
 };
 
-class LibsharedNotExported {
+class LibsharedNotExported
+{
 public:
   int libshared() const;
 
@@ -30,7 +32,8 @@ public:
   int LIBSHARED_NO_EXPORT libshared_excluded() const;
 };
 
-class LIBSHARED_NO_EXPORT LibsharedExcluded {
+class LIBSHARED_NO_EXPORT LibsharedExcluded
+{
 public:
   int libshared() const;