diff options
| author | Mike Stump <mrs@apple.com> | 2009-08-04 21:02:39 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@apple.com> | 2009-08-04 21:02:39 +0000 |
| commit | ac5fc7c6bcb494b60fee7ce615ac931c5db6135e (patch) | |
| tree | bc35a259aa268b722facf196fc38cf19480ae517 /lib/Sema/SemaTemplate.cpp | |
| parent | 06758d0ea712795fe0ff5c2dee4b9a162569dfef (diff) | |
Canonicalize else.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@78102 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 32d6069d8d..8dfb7d3881 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -681,10 +681,9 @@ bool Sema::CheckTemplateParameterList(TemplateParameterList *NewParams, PreviousDefaultArgLoc = NewTypeParm->getDefaultArgumentLoc(); } else if (SawDefaultArgument) MissingDefaultArg = true; - } - // Merge default arguments for non-type template parameters - else if (NonTypeTemplateParmDecl *NewNonTypeParm + } else if (NonTypeTemplateParmDecl *NewNonTypeParm = dyn_cast<NonTypeTemplateParmDecl>(*NewParam)) { + // Merge default arguments for non-type template parameters NonTypeTemplateParmDecl *OldNonTypeParm = OldParams? cast<NonTypeTemplateParmDecl>(*OldParam) : 0; if (OldNonTypeParm && OldNonTypeParm->hasDefaultArgument() && @@ -709,9 +708,8 @@ bool Sema::CheckTemplateParameterList(TemplateParameterList *NewParams, PreviousDefaultArgLoc = NewNonTypeParm->getDefaultArgumentLoc(); } else if (SawDefaultArgument) MissingDefaultArg = true; - } + } else { // Merge default arguments for template template parameters - else { TemplateTemplateParmDecl *NewTemplateParm = cast<TemplateTemplateParmDecl>(*NewParam); TemplateTemplateParmDecl *OldTemplateParm @@ -2487,8 +2485,7 @@ Sema::ActOnClassTemplateSpecialization(Scope *S, unsigned TagSpec, Converted.getFlatArguments(), Converted.flatSize(), Context); - } - else + } else ClassTemplateSpecializationDecl::Profile(ID, Converted.getFlatArguments(), Converted.flatSize(), |