5 files changed, 17 insertions, 8 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index 1bbf4118747..61182ef9cd4 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -460,7 +460,8 @@ void Parser::ParseClassSpecifier(DeclSpec &DS,
                                                  Attr,
                        Action::MultiTemplateParamsArg(Actions, 
                                                       &(*TemplateParams)[0],
-                                                      TemplateParams->size()));
+                                                      TemplateParams->size()),
+                                                 AS);
   else
     TagOrTempResult = Actions.ActOnTag(CurScope, TagType, TK, StartLoc, SS, Name, 
                                        NameLoc, Attr, AS);
@@ -615,7 +616,7 @@ AccessSpecifier Parser::getAccessSpecifierIfPresent() const
 ///         ::[opt] nested-name-specifier template[opt] unqualified-id ';'[TODO]
 ///         using-declaration                                            [TODO]
 /// [C++0x] static_assert-declaration
-///         template-declaration                                         [TODO]
+///         template-declaration
 /// [GNU]   '__extension__' member-declaration
 ///
 ///       member-declarator-list:
@@ -638,6 +639,10 @@ Parser::DeclTy *Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS) {
   if (Tok.is(tok::kw_static_assert))
     return ParseStaticAssertDeclaration();
       
+  if (Tok.is(tok::kw_template))
+    return ParseTemplateDeclarationOrSpecialization(Declarator::MemberContext,
+                                                    AS);
+
   // Handle:  member-declaration ::= '__extension__' member-declaration
   if (Tok.is(tok::kw___extension__)) {
     // __extension__ silences extension warnings in the subexpression.
diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp
index 2aeb182dbdf..2c07823aba2 100644
--- a/clang/lib/Parse/ParseTemplate.cpp
+++ b/clang/lib/Parse/ParseTemplate.cpp
@@ -35,7 +35,8 @@ using namespace clang;
 ///       explicit-specialization: [ C++ temp.expl.spec]
 ///         'template' '<' '>' declaration
 Parser::DeclTy *
-Parser::ParseTemplateDeclarationOrSpecialization(unsigned Context) {
+Parser::ParseTemplateDeclarationOrSpecialization(unsigned Context,
+                                                 AccessSpecifier AS) {
   assert((Tok.is(tok::kw_export) || Tok.is(tok::kw_template)) && 
 	 "Token does not start a template declaration.");
   
@@ -94,7 +95,7 @@ Parser::ParseTemplateDeclarationOrSpecialization(unsigned Context) {
   } while (Tok.is(tok::kw_export) || Tok.is(tok::kw_template));
 
   // Parse the actual template declaration.
-  return ParseDeclarationOrFunctionDefinition(&ParamLists);
+  return ParseDeclarationOrFunctionDefinition(&ParamLists, AS);
 }
 
 /// ParseTemplateParameters - Parses a template-parameter-list enclosed in
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index 135faf4e9c9..7a221d007c3 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/lib/Parse/Parser.cpp
@@ -442,10 +442,11 @@ Parser::DeclTy *Parser::ParseExternalDeclaration() {
 ///
 Parser::DeclTy *
 Parser::ParseDeclarationOrFunctionDefinition(
-                                  TemplateParameterLists *TemplateParams) {
+                                  TemplateParameterLists *TemplateParams,
+                                  AccessSpecifier AS) {
   // Parse the common declaration-specifiers piece.
   DeclSpec DS;
-  ParseDeclarationSpecifiers(DS, TemplateParams);
+  ParseDeclarationSpecifiers(DS, TemplateParams, AS);
 
   // C99 6.7.2.3p6: Handle "struct-or-union identifier;", "enum { X };"
   // declaration-specifiers init-declarator-list[opt] ';'
diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h
index 974404cbbdc..7f2f1097343 100644
--- a/clang/lib/Sema/Sema.h
+++ b/clang/lib/Sema/Sema.h
@@ -1715,7 +1715,8 @@ public:
                      SourceLocation KWLoc, const CXXScopeSpec &SS,
                      IdentifierInfo *Name, SourceLocation NameLoc,
                      AttributeList *Attr,
-                     MultiTemplateParamsArg TemplateParameterLists);
+                     MultiTemplateParamsArg TemplateParameterLists,
+                     AccessSpecifier AS);
 
   QualType CheckClassTemplateId(ClassTemplateDecl *ClassTemplate,
                                 SourceLocation TemplateLoc,
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index c0476a8d3fd..b8b1f3a5bb5 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -388,7 +388,8 @@ Sema::ActOnClassTemplate(Scope *S, unsigned TagSpec, TagKind TK,
                          SourceLocation KWLoc, const CXXScopeSpec &SS,
                          IdentifierInfo *Name, SourceLocation NameLoc,
                          AttributeList *Attr,
-                         MultiTemplateParamsArg TemplateParameterLists) {
+                         MultiTemplateParamsArg TemplateParameterLists,
+                         AccessSpecifier AS) {
   assert(TemplateParameterLists.size() > 0 && "No template parameter lists?");
   assert(TK != TK_Reference && "Can only declare or define class templates");
   bool Invalid = false;