Undo r189834 - broke test.

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@189835 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 20 insertions, 22 deletions

diff --git a/test/modularize/Inputs/InconsistentSubHeader.h b/test/modularize/Inputs/InconsistentSubHeader.h
index ab02b250..f87ea655 100644
--- a/test/modularize/Inputs/InconsistentSubHeader.h
+++ b/test/modularize/Inputs/InconsistentSubHeader.h
@@ -1,11 +1,11 @@
 // Set up so TypeInt only defined during InconsistentHeader1.h include.
 #ifdef SYMBOL1
 #define SYMBOL 1
-#define FUNC_STYLE(a, b) a || b
+#define FUNC_STYLE(a, b) a||b
 #endif
 #ifdef SYMBOL2
 #define SYMBOL 2
-#define FUNC_STYLE(a, b) a &&b
+#define FUNC_STYLE(a, b) a&&b
 #endif
 
 #if SYMBOL == 1
diff --git a/test/modularize/Inputs/NamespaceClasses.h b/test/modularize/Inputs/NamespaceClasses.h
index 94167c4b..57e6091f 100644
--- a/test/modularize/Inputs/NamespaceClasses.h
+++ b/test/modularize/Inputs/NamespaceClasses.h
@@ -1,21 +1,20 @@
 // Define same class name in different namespaces.
 
 namespace Namespace1 {
-class NamespaceClass {
-public:
-  NamespaceClass() : Member(0) {}
-
-private:
-  int Member;
-};
+  class NamespaceClass {
+  public:
+    NamespaceClass() : Member(0) {}
+  private:
+    int Member;
+  };
 }
 
 namespace Namespace2 {
-class NamespaceClass {
-public:
-  NamespaceClass() : Member(0) {}
-
-private:
-  int Member;
-};
+  class NamespaceClass {
+  public:
+    NamespaceClass() : Member(0) {}
+  private:
+    int Member;
+  };
 }
+
diff --git a/test/modularize/Inputs/SomeDecls.h b/test/modularize/Inputs/SomeDecls.h
index c3ec2fdc..8892b650 100644
--- a/test/modularize/Inputs/SomeDecls.h
+++ b/test/modularize/Inputs/SomeDecls.h
@@ -8,9 +8,9 @@ void FuncOverload(int arg) {}
 void FuncOverload(char *arg) {}
 
 namespace Namespace1 {
-void FuncNameSpace() {}
+  void FuncNameSpace() {}
 }
 
 namespace Namespace2 {
-void FuncNameSpace() {}
+  void FuncNameSpace() {}
 }
diff --git a/test/modularize/Inputs/TemplateClasses.h b/test/modularize/Inputs/TemplateClasses.h
index e0b9402f..3eab6d90 100644
--- a/test/modularize/Inputs/TemplateClasses.h
+++ b/test/modularize/Inputs/TemplateClasses.h
@@ -1,16 +1,15 @@
 // Exercise some template issues.  Should not produce errors.
 
 // Forward declaration.
-template <class T> class TemplateClass;
+template<class T> class TemplateClass;
 
 // Full declaration.
-template <class T> class TemplateClass {
+template<class T>class TemplateClass {
 public:
   TemplateClass() {}
-
 private:
   T Member;
 };
 
 // Template alias.
-template <class T> using TemplateClassAlias = TemplateClass<T>;
+template<class T> using TemplateClassAlias = TemplateClass<T>;