diff options
| author | John Thompson <John.Thompson.JTSoftware@gmail.com> | 2013-07-27 02:06:36 +0000 |
|---|---|---|
| committer | John Thompson <John.Thompson.JTSoftware@gmail.com> | 2013-07-27 02:06:36 +0000 |
| commit | 0f6795228ddafef1e70b130444eb47d1615efaa2 (patch) | |
| tree | a1ca7fe80fa0b2eb8c19f329f0db25362ba047c6 /test/modularize | |
| parent | c5121dd100ba20831f1882490f76519f48aee5d4 (diff) | |
Fixed checkin of wrong old files. Hopefully this is the end of the test failure.
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@187287 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/modularize')
| -rw-r--r-- | test/modularize/Inputs/InconsistentSubHeader.h | 4 | ||||
| -rw-r--r-- | test/modularize/ProblemsInconsistent.modularize | 4 |
2 files changed, 4 insertions, 4 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/ProblemsInconsistent.modularize b/test/modularize/ProblemsInconsistent.modularize index f2206905..04d0b013 100644 --- a/test/modularize/ProblemsInconsistent.modularize +++ b/test/modularize/ProblemsInconsistent.modularize @@ -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: |