From b75acec5a42dfc1ec48b533fe0c89535f7570b22 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Wed, 24 Sep 2014 11:22:45 +0200
Subject: [PATCH] Use the canonical decl as keep-n-args key; we might have had
 a previous decl.

---
 core/meta/src/TCling.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx
index b70726a..307ae02 100644
--- a/core/meta/src/TCling.cxx
+++ b/core/meta/src/TCling.cxx
@@ -1407,7 +1407,7 @@ void TCling::RegisterModule(const char* modulename,
 
       // Drill through namespaces recursively until the template is found
       if(ClassTemplateDecl* TD = FindTemplateInNamespace(T->getFirstDecl().getSingleDecl())){
-         fNormalizedCtxt->AddTemplAndNargsToKeep(TD, nArgsToSkip);
+         fNormalizedCtxt->AddTemplAndNargsToKeep(TD->getCanonicalDecl(), nArgsToSkip);
       }
 
    }
-- 
1.8.2