diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-01-03 19:48:16 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-01-03 19:48:16 +0000 |
| commit | 663b48f13b2d525760e0cd82d2695a2f3c9fb69f (patch) | |
| tree | bace2be1a8ab3d9c2ebb59e039cc90adbc5740e6 /clang/test | |
| parent | 3c9707bd90a585239db5a1f118e62a1218b532f8 (diff) | |
| download | bcm5719-llvm-663b48f13b2d525760e0cd82d2695a2f3c9fb69f.tar.gz bcm5719-llvm-663b48f13b2d525760e0cd82d2695a2f3c9fb69f.zip | |
Re-uglify #public and #private to #__public_macro and #__private_macro.
llvm-svn: 147469
Diffstat (limited to 'clang/test')
5 files changed, 7 insertions, 7 deletions
diff --git a/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h b/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h index d2a5174dfef..9425f4873cf 100644 --- a/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h +++ b/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h @@ -1,5 +1,5 @@ #include <Module/Module.h> //expected-warning{{treating #include as an import of module 'Module'}} #define DEPENDS_ON_MODULE 1 -#private DEPENDS_ON_MODULE +#__private_macro DEPENDS_ON_MODULE diff --git a/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h b/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h index b13bcdd7663..f7f9fb66c9e 100644 --- a/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h +++ b/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h @@ -1,5 +1,5 @@ #ifndef MODULE_SUBFRAMEWORK_H #define MODULE_SUBFRAMEWORK_H -#private MODULE_SUBFRAMEWORK_H +#__private_macro MODULE_SUBFRAMEWORK_H char *module_subframework; #endif diff --git a/clang/test/Modules/Inputs/Module.framework/Headers/Module.h b/clang/test/Modules/Inputs/Module.framework/Headers/Module.h index 832855f8de3..738b2221cbb 100644 --- a/clang/test/Modules/Inputs/Module.framework/Headers/Module.h +++ b/clang/test/Modules/Inputs/Module.framework/Headers/Module.h @@ -14,7 +14,7 @@ const char *getModuleVersion(void); @end #define MODULE_H_MACRO 1 -#private MODULE_H_MACRO +#__private_macro MODULE_H_MACRO #include <Module/Sub.h> #include <Module/Buried/Treasure.h> diff --git a/clang/test/Modules/Inputs/macros.h b/clang/test/Modules/Inputs/macros.h index ed1b46766fb..4f535563ad2 100644 --- a/clang/test/Modules/Inputs/macros.h +++ b/clang/test/Modules/Inputs/macros.h @@ -3,8 +3,8 @@ #define FLOAT float #define DOUBLE double -#public INTEGER -#private FLOAT -#private MODULE +#__public_macro INTEGER +#__private_macro FLOAT +#__private_macro MODULE int (INTEGER); diff --git a/clang/test/Modules/macros.c b/clang/test/Modules/macros.c index 3fddcc7ff5d..35fde4a9a65 100644 --- a/clang/test/Modules/macros.c +++ b/clang/test/Modules/macros.c @@ -22,7 +22,7 @@ double d; DOUBLE *dp = &d; -#public WIBBLE // expected-error{{no macro named 'WIBBLE'}} +#__public_macro WIBBLE // expected-error{{no macro named 'WIBBLE'}} void f() { // CHECK-PREPROCESSED: int i = INTEGER; |
