commit e973899f4687ae8693d4dfc0cdd8e4d354caf5fd
author Anders Carlsson <andersca@mac.com> Sat Jan 22 14:43:56 2011 +0000
committer Anders Carlsson <andersca@mac.com> Sat Jan 22 14:43:56 2011 +0000
tree 5c270f757839c0cda9a8592354da9da9f1e42fa1
parent cc91b7a3f60ea2bdb8ec059935bdd10d4ac6f784

A member function template cannot be virtual.

llvm-svn: 124031

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index be6d60e..a266b60 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -3705,7 +3705,14 @@
              diag::err_virtual_non_function);
       } else if (!CurContext->isRecord()) {
         // 'virtual' was specified outside of the class.
-        Diag(D.getDeclSpec().getVirtualSpecLoc(), diag::err_virtual_out_of_class)
+        Diag(D.getDeclSpec().getVirtualSpecLoc(), 
+             diag::err_virtual_out_of_class)
+          << FixItHint::CreateRemoval(D.getDeclSpec().getVirtualSpecLoc());
+      } else if (NewFD->getDescribedFunctionTemplate()) {
+        // C++ [temp.mem]p3:
+        //  A member function template shall not be virtual.
+        Diag(D.getDeclSpec().getVirtualSpecLoc(),
+             diag::err_virtual_member_function_template)
           << FixItHint::CreateRemoval(D.getDeclSpec().getVirtualSpecLoc());
       } else {
         // Okay: Add virtual to the method.