From: Dmitri Gribenko <gribozavr@gmail.com>
Date: Wed, 20 Jun 2012 01:06:08 +0000 (+0000)
Subject: Unbreak GCC build: GCC doesn't like clang::Parser::CommentHandler and class clang... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=056e2c30050a94141150ba561268d90b4d18e378;p=clang

Unbreak GCC build: GCC doesn't like clang::Parser::CommentHandler and class clang::CommentHandler to have same name.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158780 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index b451ed97e9..d6c75aa0f2 100644
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -170,7 +170,7 @@ class Parser : public CodeCompletionHandler {
   OwningPtr<PragmaHandler> RedefineExtnameHandler;
   OwningPtr<PragmaHandler> FPContractHandler;
   OwningPtr<PragmaHandler> OpenCLExtensionHandler;
-  OwningPtr<CommentHandler> CommentHandler;
+  OwningPtr<CommentHandler> CommentSemaHandler;
 
   /// Whether the '>' token acts as an operator or not. This will be
   /// true except when we are parsing an expression within a C++
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 10fb8eb8e9..c27660f2f8 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -92,8 +92,8 @@ Parser::Parser(Preprocessor &pp, Sema &actions, bool SkipFunctionBodies)
     PP.AddPragmaHandler("OPENCL", FPContractHandler.get());
   }
 
-  CommentHandler.reset(new ActionCommentHandler(actions));
-  PP.addCommentHandler(CommentHandler.get());
+  CommentSemaHandler.reset(new ActionCommentHandler(actions));
+  PP.addCommentHandler(CommentSemaHandler.get());
 
   PP.setCodeCompletionHandler(*this);
 }
@@ -440,7 +440,7 @@ Parser::~Parser() {
   PP.RemovePragmaHandler("STDC", FPContractHandler.get());
   FPContractHandler.reset();
 
-  PP.removeCommentHandler(CommentHandler.get());
+  PP.removeCommentHandler(CommentSemaHandler.get());
 
   PP.clearCodeCompletionHandler();