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 | 1ac13c37d8af0145b7e03fea70b7b1476b8828c9 (patch) | |
| tree | 1139143f710cfe111d7af85fa97fe90f15ee7fe9 /test/Modules | |
| parent | eb4f2c56c298071d58b441ccf801b039be93788a (diff) | |
Re-uglify #public and #private to #__public_macro and #__private_macro.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147469 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Modules')
5 files changed, 7 insertions, 7 deletions
diff --git a/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h b/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h index d2a5174dfe..9425f4873c 100644 --- a/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h +++ b/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/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h b/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h index b13bcdd766..f7f9fb66c9 100644 --- a/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h +++ b/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/test/Modules/Inputs/Module.framework/Headers/Module.h b/test/Modules/Inputs/Module.framework/Headers/Module.h index 832855f8de..738b2221cb 100644 --- a/test/Modules/Inputs/Module.framework/Headers/Module.h +++ b/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/test/Modules/Inputs/macros.h b/test/Modules/Inputs/macros.h index ed1b46766f..4f535563ad 100644 --- a/test/Modules/Inputs/macros.h +++ b/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/test/Modules/macros.c b/test/Modules/macros.c index 3fddcc7ff5..35fde4a9a6 100644 --- a/test/Modules/macros.c +++ b/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; |