diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2013-08-12 11:43:36 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2013-08-12 11:43:36 +0000 |
| commit | 8e20be2aea0c8637335ce0d1e1d19e739c3ebe68 (patch) | |
| tree | f4663a57478980c9af40e2da518986abe510b5ae | |
| parent | 98c39a184eb5c6d8c3400b21e995f7838ffeeedc (diff) | |
| download | bcm5719-llvm-8e20be2aea0c8637335ce0d1e1d19e739c3ebe68.tar.gz bcm5719-llvm-8e20be2aea0c8637335ce0d1e1d19e739c3ebe68.zip | |
Remove CRs added in r187370.
llvm-svn: 188168
| -rw-r--r-- | clang-tools-extra/modularize/Modularize.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/clang-tools-extra/modularize/Modularize.cpp b/clang-tools-extra/modularize/Modularize.cpp index 1eef5e3fdcb..823165bb58d 100644 --- a/clang-tools-extra/modularize/Modularize.cpp +++ b/clang-tools-extra/modularize/Modularize.cpp @@ -50,26 +50,26 @@ // expressions, and preprocessor conditional directives that evaluate // inconsistently, and can produce error messages like the following: // -// (...)/SubHeader.h:11:5:
-// #if SYMBOL == 1
-// ^
-// error: Macro instance 'SYMBOL' has different values in this header,
-// depending on how it was included.
-// 'SYMBOL' expanded to: '1' with respect to these inclusion paths:
-// (...)/Header1.h
-// (...)/SubHeader.h
-// (...)/SubHeader.h:3:9:
-// #define SYMBOL 1
-// ^
-// Macro defined here.
-// 'SYMBOL' expanded to: '2' with respect to these inclusion paths:
-// (...)/Header2.h
-// (...)/SubHeader.h
-// (...)/SubHeader.h:7:9:
-// #define SYMBOL 2
-// ^
-// Macro defined here.
-//
+// (...)/SubHeader.h:11:5: +// #if SYMBOL == 1 +// ^ +// error: Macro instance 'SYMBOL' has different values in this header, +// depending on how it was included. +// 'SYMBOL' expanded to: '1' with respect to these inclusion paths: +// (...)/Header1.h +// (...)/SubHeader.h +// (...)/SubHeader.h:3:9: +// #define SYMBOL 1 +// ^ +// Macro defined here. +// 'SYMBOL' expanded to: '2' with respect to these inclusion paths: +// (...)/Header2.h +// (...)/SubHeader.h +// (...)/SubHeader.h:7:9: +// #define SYMBOL 2 +// ^ +// Macro defined here. +// // See PreprocessorTracker.cpp for additional details. // // Current problems: |

