commit d449c792d98f58277e02c0ddc8330cd9de5f82f5
author Kaelyn Uhrain <rikka@google.com> Tue Nov 13 00:18:47 2012 +0000
committer Kaelyn Uhrain <rikka@google.com> Tue Nov 13 00:18:47 2012 +0000
tree 38b99b2dd36c23440247f72a8c88c0e1d6a82519
parent bae930d4c69a624881e66f1628ee615e149362f7

A couple of small fixes to r167783

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167791 91177308-0d34-0410-b5e6-96231b3b80d8

include/clang/Basic/Attr.td

diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 72f02a8..5593c60 100644
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -699,7 +699,7 @@
 }
 
 def WarnUnusedResult : InheritableAttr {
-  let Spellings = [GNU<"warn_unused_result">, CXX11<"","warn_unused_result">];
+  let Spellings = [GNU<"warn_unused_result">, CXX11<"clang","warn_unused_result">];
 }
 
 def Weak : InheritableAttr {

lib/Sema/SemaDeclAttr.cpp

diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index 70bc019..77413b0 100644
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -2449,7 +2449,7 @@
 
   if (!isFunction(D) && !isa<ObjCMethodDecl>(D) && !isa<CXXRecordDecl>(D)) {
     S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type)
-      << Attr.getName() << ExpectedFunctionOrMethod;
+      << Attr.getName() << ExpectedFunctionMethodOrClass;
     return;
   }
 

test/SemaCXX/warn-unused-result.cpp

diff --git a/test/SemaCXX/warn-unused-result.cpp b/test/SemaCXX/warn-unused-result.cpp
index 459e5ae..5ce0f98 100644
--- a/test/SemaCXX/warn-unused-result.cpp
+++ b/test/SemaCXX/warn-unused-result.cpp
@@ -44,7 +44,7 @@
 }
 
 namespace warn_unused_CXX11 {
-struct [[warn_unused_result]] Status {
+struct [[clang::warn_unused_result]] Status {
   bool ok() const;
 };
 Status DoSomething();