aboutsummaryrefslogtreecommitdiff
path: root/lib/Basic
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2012-01-03 19:48:16 +0000
committerDouglas Gregor <dgregor@apple.com>2012-01-03 19:48:16 +0000
commit1ac13c37d8af0145b7e03fea70b7b1476b8828c9 (patch)
tree1139143f710cfe111d7af85fa97fe90f15ee7fe9 /lib/Basic
parenteb4f2c56c298071d58b441ccf801b039be93788a (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 'lib/Basic')
-rw-r--r--lib/Basic/IdentifierTable.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp
index 3da15bde0e..c191456b1e 100644
--- a/lib/Basic/IdentifierTable.cpp
+++ b/lib/Basic/IdentifierTable.cpp
@@ -217,16 +217,18 @@ tok::PPKeywordKind IdentifierInfo::getPPKeywordID() const {
CASE( 6, 'i', 'n', ifndef);
CASE( 6, 'i', 'p', import);
CASE( 6, 'p', 'a', pragma);
- CASE( 6, 'p', 'b', public);
CASE( 7, 'd', 'f', defined);
CASE( 7, 'i', 'c', include);
- CASE( 7, 'p', 'i', private);
CASE( 7, 'w', 'r', warning);
CASE( 8, 'u', 'a', unassert);
CASE(12, 'i', 'c', include_next);
+ CASE(14, '_', 'p', __public_macro);
+
+ CASE(15, '_', 'p', __private_macro);
+
CASE(16, '_', 'i', __include_macros);
#undef CASE
#undef HASH