summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclAttr.cpp
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2013-12-18 23:44:18 +0000
committerAaron Ballman <aaron@aaronballman.com>2013-12-18 23:44:18 +0000
commit8edb5c2081daf48c1bff1df7bb37a3ccedddee37 (patch)
treeb30cc3079fbf8b9e2d68f407f077f4a3f237f1ed /clang/lib/Sema/SemaDeclAttr.cpp
parent1c09b264e3729f87810cdb3b265d4f91ebdc8724 (diff)
downloadbcm5719-llvm-8edb5c2081daf48c1bff1df7bb37a3ccedddee37.tar.gz
bcm5719-llvm-8edb5c2081daf48c1bff1df7bb37a3ccedddee37.zip
Refactor the Microsoft inheritance attribute handling so that it no longer has special treatment. Also fixes a minor bug where the attributes were being parsed as though they were GNU-style attributes when they were in fact keyword attributes.
llvm-svn: 197629
Diffstat (limited to 'clang/lib/Sema/SemaDeclAttr.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclAttr.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index b44506c0a3f..01a1bed0d41 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -4091,12 +4091,8 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
case AttributeList::AT_Uuid:
handleUuidAttr(S, D, Attr);
break;
- case AttributeList::AT_SingleInheritance:
- handleSimpleAttribute<SingleInheritanceAttr>(S, D, Attr); break;
- case AttributeList::AT_MultipleInheritance:
- handleSimpleAttribute<MultipleInheritanceAttr>(S, D, Attr); break;
- case AttributeList::AT_VirtualInheritance:
- handleSimpleAttribute<VirtualInheritanceAttr>(S, D, Attr); break;
+ case AttributeList::AT_MSInheritance:
+ handleSimpleAttribute<MSInheritanceAttr>(S, D, Attr); break;
case AttributeList::AT_ForceInline:
handleSimpleAttribute<ForceInlineAttr>(S, D, Attr); break;
case AttributeList::AT_SelectAny:
OpenPOWER on IntegriCloud