From 663b48f13b2d525760e0cd82d2695a2f3c9fb69f Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Tue, 3 Jan 2012 19:48:16 +0000 Subject: Re-uglify #public and #private to #__public_macro and #__private_macro. llvm-svn: 147469 --- clang/lib/Lex/PPDirectives.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'clang/lib/Lex/PPDirectives.cpp') diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index 138e7d98791..4379b6bad18 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -682,12 +682,12 @@ TryAgain: //isExtension = true; // FIXME: implement #unassert break; - case tok::pp_public: + case tok::pp___public_macro: if (getLangOptions().Modules) return HandleMacroPublicDirective(Result); break; - case tok::pp_private: + case tok::pp___private_macro: if (getLangOptions().Modules) return HandleMacroPrivateDirective(Result); break; @@ -1052,8 +1052,8 @@ void Preprocessor::HandleMacroPublicDirective(Token &Tok) { if (MacroNameTok.is(tok::eod)) return; - // Check to see if this is the last token on the #public line. - CheckEndOfDirective("public"); + // Check to see if this is the last token on the #__public_macro line. + CheckEndOfDirective("__public_macro"); // Okay, we finally have a valid identifier to undef. MacroInfo *MI = getMacroInfo(MacroNameTok.getIdentifierInfo()); @@ -1083,8 +1083,8 @@ void Preprocessor::HandleMacroPrivateDirective(Token &Tok) { if (MacroNameTok.is(tok::eod)) return; - // Check to see if this is the last token on the #private line. - CheckEndOfDirective("private"); + // Check to see if this is the last token on the #__private_macro line. + CheckEndOfDirective("__private_macro"); // Okay, we finally have a valid identifier to undef. MacroInfo *MI = getMacroInfo(MacroNameTok.getIdentifierInfo()); -- cgit v1.2.3