Removed TemplateParameters.

1 files changed, 1 insertions, 30 deletions

diff --git a/src/shared/cplusplus/CheckDeclaration.cpp b/src/shared/cplusplus/CheckDeclaration.cpp
index f431ca9db5..595d549a48 100644
--- a/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/src/shared/cplusplus/CheckDeclaration.cpp
@@ -66,22 +66,18 @@ CheckDeclaration::CheckDeclaration(Semantic *semantic)
     : SemanticCheck(semantic),
       _declaration(0),
       _scope(0),
-      _templateParameters(0),
       _checkAnonymousArguments(false)
 { }
 
 CheckDeclaration::~CheckDeclaration()
 { }
 
-void CheckDeclaration::check(DeclarationAST *declaration,
-                             Scope *scope, TemplateParameters *templateParameters)
+void CheckDeclaration::check(DeclarationAST *declaration, Scope *scope)
 {
     Scope *previousScope = switchScope(scope);
-    TemplateParameters *previousTemplateParameters = switchTemplateParameters(templateParameters);
     DeclarationAST *previousDeclaration = switchDeclaration(declaration);
     accept(declaration);
     (void) switchDeclaration(previousDeclaration);
-    (void) switchTemplateParameters(previousTemplateParameters);
     (void) switchScope(previousScope);
 }
 
@@ -106,13 +102,6 @@ Scope *CheckDeclaration::switchScope(Scope *scope)
     return previousScope;
 }
 
-TemplateParameters *CheckDeclaration::switchTemplateParameters(TemplateParameters *templateParameters)
-{
-    TemplateParameters *previousTemplateParameters = _templateParameters;
-    _templateParameters = templateParameters;
-    return previousTemplateParameters;
-}
-
 void CheckDeclaration::setDeclSpecifiers(Symbol *symbol, const FullySpecifiedType &declSpecifiers)
 {
     if (! symbol)
@@ -172,13 +161,6 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
     FullySpecifiedType declSpecifiers = semantic()->check(ast->decl_specifier_list, _scope);
     FullySpecifiedType qualTy = declSpecifiers.qualifiedType();
 
-    if (_templateParameters && declSpecifiers) {
-        if (Class *klass = declSpecifiers->asClassType()) {
-            klass->setTemplateParameters(_templateParameters);
-            _templateParameters = 0; // consume the template parameters
-        }
-    }
-
     if (ast->decl_specifier_list && ! ast->declarator_list) {
         ElaboratedTypeSpecifierAST *elab_type_spec = ast->decl_specifier_list->value->asElaboratedTypeSpecifier();
 
@@ -194,11 +176,6 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
             ForwardClassDeclaration *symbol =
                     control()->newForwardClassDeclaration(sourceLocation, name);
 
-            if (_templateParameters) {
-                symbol->setTemplateParameters(_templateParameters);
-                _templateParameters = 0;
-            }
-
             setDeclSpecifiers(symbol, declSpecifiers);
 
             _scope->addMember(symbol);
@@ -247,11 +224,6 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
 
         setDeclSpecifiers(symbol, declSpecifiers);
 
-        if (_templateParameters && it == ast->declarator_list) {
-            symbol->setTemplateParameters(_templateParameters);
-            _templateParameters = 0; // consume the template parameters
-        }
-
         symbol->setVisibility(semantic()->currentVisibility());
 
         if (it->value && it->value->initializer) {
@@ -345,7 +317,6 @@ bool CheckDeclaration::visit(FunctionDefinitionAST *ast)
         fun->setSourceLocation(loc, translationUnit());
     }
     fun->setName(name);
-    fun->setTemplateParameters(_templateParameters);
     fun->setVisibility(semantic()->currentVisibility());
     fun->setMethodKey(semantic()->currentMethodKey());