summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-09-28 20:50:54 +0000
committerDouglas Gregor <dgregor@apple.com>2010-09-28 20:50:54 +0000
commit11c024bbebdcbfb388e2dbf70dfb69d1d9743e48 (patch)
tree4e5e0ee453c5d5e0e080a39539f80fa1309f9b0b /clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
parent1db5c941ad02d7aabd729d2a158a0f9550b77718 (diff)
downloadbcm5719-llvm-11c024bbebdcbfb388e2dbf70dfb69d1d9743e48.tar.gz
bcm5719-llvm-11c024bbebdcbfb388e2dbf70dfb69d1d9743e48.zip
Reinstate r114925 and r114929, both steps toward
<rdar://problem/8459981>. llvm-svn: 114984
Diffstat (limited to 'clang/lib/Sema/SemaTemplateInstantiateDecl.cpp')
-rw-r--r--clang/lib/Sema/SemaTemplateInstantiateDecl.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index f9ff20463ab..d87629151eb 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -1996,10 +1996,9 @@ TemplateDeclInstantiator::InitMethodInstantiation(CXXMethodDecl *New,
if (InitFunctionInstantiation(New, Tmpl))
return true;
- CXXRecordDecl *Record = cast<CXXRecordDecl>(Owner);
New->setAccess(Tmpl->getAccess());
if (Tmpl->isVirtualAsWritten())
- Record->setMethodAsVirtual(New);
+ New->setVirtualAsWritten(true);
// FIXME: attributes
// FIXME: New needs a pointer to Tmpl
OpenPOWER on IntegriCloud