diff options
author | Francois Pichet <pichet2000@gmail.com> | 2011-05-14 17:46:46 +0000 |
---|---|---|
committer | Francois Pichet <pichet2000@gmail.com> | 2011-05-14 17:46:46 +0000 |
commit | 1fa8028d9ff5de64f8b9d55731ca83a2d3423a77 (patch) | |
tree | 266798745da1de6aa4ce53152d27d1a443c34c26 /lib/Sema/SemaDecl.cpp | |
parent | 1804174e1591bf59118f317775b48edd0382c3f0 (diff) |
In Microsoft mode, allow template function explicit specialization at class scope.
Necessary to parse MFC and MSVC standard lib code.
Example:
struct X {
template<class T> void f(T) { }
template<> void f(int) { }
}
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131347 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
-rw-r--r-- | lib/Sema/SemaDecl.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 58b807fb2a..25d23584b8 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -1685,10 +1685,14 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD) { if (OldMethod && NewMethod) { // Preserve triviality. NewMethod->setTrivial(OldMethod->isTrivial()); - + + // MSVC allows explicit template specialization at class scope. + bool IsMSExplicitSpecialization = getLangOptions().Microsoft && + NewMethod->isFunctionTemplateSpecialization(); bool isFriend = NewMethod->getFriendObjectKind(); - if (!isFriend && NewMethod->getLexicalDeclContext()->isRecord()) { + if (!isFriend && NewMethod->getLexicalDeclContext()->isRecord() && + !IsMSExplicitSpecialization) { // -- Member function declarations with the same name and the // same parameter types cannot be overloaded if any of them // is a static member function declaration. |