[cfe-commits] [PATCH] Fix a warning due to "const" breakage in r130022.

[NAKAMURA Takumi]

---
 include/clang/Parse/Parser.h             |    4 ++--
 include/clang/Sema/Sema.h                |    2 +-
 lib/Parse/ParseTemplate.cpp              |    4 ++--
 lib/Sema/SemaTemplateInstantiateDecl.cpp |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
I am not confident my fix were proper or not.
(Francois, you may apply it)

...Takumi

diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index 0880e54..2d91bc8 100644
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -937,8 +937,8 @@ private:
     LateParsedTemplateMapT;
   LateParsedTemplateMapT LateParsedTemplateMap;
 
-  static void LateTemplateParserCallback(void *P, FunctionDecl *FD);
-  void LateTemplateParser(FunctionDecl *FD);
+  static void LateTemplateParserCallback(void *P, const FunctionDecl *FD);
+  void LateTemplateParser(const FunctionDecl *FD);
 
   Sema::ParsingClassState
   PushParsingClass(Decl *TagOrTemplate, bool TopLevelClass);
diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h
index 3694d7e..21e5d94 100644
--- a/include/clang/Sema/Sema.h
+++ b/include/clang/Sema/Sema.h
@@ -308,7 +308,7 @@ public:
   llvm::SmallVector<const DeclaratorDecl*, 4> UnusedFileScopedDecls;
 
   /// \brief Callback to the parser to parse templated functions when needed.
-  typedef void LateTemplateParserCB(void *P, FunctionDecl *FD);
+  typedef void LateTemplateParserCB(void *P, const FunctionDecl *FD);
   LateTemplateParserCB *LateTemplateParser;
   void *OpaqueParser; 
 
diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp
index f21e091..12e38da 100644
--- a/lib/Parse/ParseTemplate.cpp
+++ b/lib/Parse/ParseTemplate.cpp
@@ -1128,12 +1128,12 @@ SourceRange Parser::ParsedTemplateInfo::getSourceRange() const {
   return R;
 }
 
-void Parser::LateTemplateParserCallback(void *P, FunctionDecl *FD) {
+void Parser::LateTemplateParserCallback(void *P, const FunctionDecl *FD) {
   ((Parser*)P)->LateTemplateParser(FD);
 }
 
 
-void Parser::LateTemplateParser(FunctionDecl *FD) {
+void Parser::LateTemplateParser(const FunctionDecl *FD) {
   LateParsedTemplatedFunction *LPT = LateParsedTemplateMap[FD];
   if (LPT) {
     ParseLateTemplatedFuncDef(*LPT);
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index c972c66..c4e171e 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -2273,7 +2273,7 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation,
   // a templated function definition. 
   if (!Pattern && PatternDecl && PatternDecl->isLateTemplateParsed() &&
       LateTemplateParser) {
-    LateTemplateParser(OpaqueParser, (FunctionDecl*)PatternDecl);
+    LateTemplateParser(OpaqueParser, PatternDecl);
     Pattern = PatternDecl->getBody(PatternDecl);
   }
 

_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits