[cfe-commits] r158780 - in /cfe/trunk: include/clang/Parse/Parser.h lib/Parse/Parser.cpp
Dmitri Gribenko
gribozavr at gmail.com
Tue Jun 19 18:06:09 PDT 2012
Author: gribozavr
Date: Tue Jun 19 20:06:08 2012
New Revision: 158780
URL: http://llvm.org/viewvc/llvm-project?rev=158780&view=rev
Log:
Unbreak GCC build: GCC doesn't like clang::Parser::CommentHandler and class clang::CommentHandler to have same name.
Modified:
cfe/trunk/include/clang/Parse/Parser.h
cfe/trunk/lib/Parse/Parser.cpp
Modified: cfe/trunk/include/clang/Parse/Parser.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=158780&r1=158779&r2=158780&view=diff
==============================================================================
--- cfe/trunk/include/clang/Parse/Parser.h (original)
+++ cfe/trunk/include/clang/Parse/Parser.h Tue Jun 19 20:06:08 2012
@@ -170,7 +170,7 @@
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++
Modified: cfe/trunk/lib/Parse/Parser.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Parser.cpp?rev=158780&r1=158779&r2=158780&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/Parser.cpp (original)
+++ cfe/trunk/lib/Parse/Parser.cpp Tue Jun 19 20:06:08 2012
@@ -92,8 +92,8 @@
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 @@
PP.RemovePragmaHandler("STDC", FPContractHandler.get());
FPContractHandler.reset();
- PP.removeCommentHandler(CommentHandler.get());
+ PP.removeCommentHandler(CommentSemaHandler.get());
PP.clearCodeCompletionHandler();
More information about the cfe-commits
mailing list