[clang-tools-extra] r187287 - Fixed checkin of wrong old files. Hopefully this is the end of the test failure.

[John Thompson]

Author: jtsoftware
Date: Fri Jul 26 21:06:36 2013
New Revision: 187287

URL: http://llvm.org/viewvc/llvm-project?rev=187287&view=rev
Log:
Fixed checkin of wrong old files. Hopefully this is the end of the test failure.

Modified:
    clang-tools-extra/trunk/test/modularize/Inputs/InconsistentSubHeader.h
    clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize

Modified: clang-tools-extra/trunk/test/modularize/Inputs/InconsistentSubHeader.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/Inputs/InconsistentSubHeader.h?rev=187287&r1=187286&r2=187287&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/modularize/Inputs/InconsistentSubHeader.h (original)
+++ clang-tools-extra/trunk/test/modularize/Inputs/InconsistentSubHeader.h Fri Jul 26 21:06:36 2013
@@ -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

Modified: clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize?rev=187287&r1=187286&r2=187287&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize (original)
+++ clang-tools-extra/trunk/test/modularize/ProblemsInconsistent.modularize Fri Jul 26 21:06:36 2013
@@ -17,14 +17,14 @@ Inputs/InconsistentHeader2.h
 # CHECK-NEXT:     {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentHeader1.h
 # CHECK-NEXT:       {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h
 # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:4:9:
-# CHECK-NEXT: #define FUNC_STYLE(a, b) a || b
+# CHECK-NEXT: #define FUNC_STYLE(a, b) a||b
 # CHECK-NEXT:         ^
 # CHECK-NEXT: Macro defined here.
 # CHECK-NEXT:   'FUNC_STYLE(1, 0);' expanded to: '1&&0' with respect to these inclusion paths:
 # CHECK-NEXT:     {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentHeader2.h
 # CHECK-NEXT:       {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h
 # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:8:9:
-# CHECK-NEXT: #define FUNC_STYLE(a, b) a &&b
+# CHECK-NEXT: #define FUNC_STYLE(a, b) a&&b
 # CHECK-NEXT:         ^
 # CHECK-NEXT: Macro defined here.
 # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:11:5: