From: Aaron Ballman <aaron@aaronballman.com>
Date: Thu, 13 Feb 2014 04:31:04 +0000 (+0000)
Subject: There is no std namespace for standards-based attributes. Removing the scope qualifie... 
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44d2ed98179a07d69ebbd5117ca718fd99263f31;p=platform%2Fupstream%2Fllvm.git

There is no std namespace for standards-based attributes. Removing the scope qualifier and updating the only affected test case.

llvm-svn: 201294
---

diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td
index e91e1ca..0ed154e 100644
--- a/clang/include/clang/Basic/Attr.td
+++ b/clang/include/clang/Basic/Attr.td
@@ -364,8 +364,7 @@ def Bounded : IgnoredAttr {
 }
 
 def CarriesDependency : InheritableParamAttr {
-  let Spellings = [GNU<"carries_dependency">, CXX11<"","carries_dependency">,
-                   CXX11<"std","carries_dependency">];
+  let Spellings = [GNU<"carries_dependency">, CXX11<"","carries_dependency">];
   let Subjects = SubjectList<[ParmVar, ObjCMethod, Function], ErrorDiag>;
 }
 
@@ -480,7 +479,7 @@ def C11NoReturn : InheritableAttr {
 }
 
 def CXX11NoReturn : InheritableAttr {
-  let Spellings = [CXX11<"","noreturn">, CXX11<"std","noreturn">];
+  let Spellings = [CXX11<"","noreturn">];
   let Subjects = SubjectList<[Function], ErrorDiag>;
 }
 
diff --git a/clang/test/SemaCXX/cxx11-attr-print.cpp b/clang/test/SemaCXX/cxx11-attr-print.cpp
index 01325d3..999eaed 100644
--- a/clang/test/SemaCXX/cxx11-attr-print.cpp
+++ b/clang/test/SemaCXX/cxx11-attr-print.cpp
@@ -42,9 +42,6 @@ int f3 [[gnu::warn_unused_result]] ();
 // CHECK: {{\[}}[noreturn]];
 void f4 [[noreturn]] ();
 
-// CHECK: {{\[}}[std::noreturn]];
-void f5 [[std::noreturn]] ();
-
 // CHECK: __attribute__((gnu_inline));
 inline void f6() __attribute__((gnu_inline));