Skip to content

Commit

Permalink
There is no std namespace for standards-based attributes. Removing th…
Browse files Browse the repository at this point in the history
…e scope qualifier and updating the only affected test case.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201294 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
AaronBallman committed Feb 13, 2014
1 parent 10a3be3 commit 6e1cfa4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
5 changes: 2 additions & 3 deletions include/clang/Basic/Attr.td
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
}

Expand Down Expand Up @@ -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>;
}

Expand Down
3 changes: 0 additions & 3 deletions test/SemaCXX/cxx11-attr-print.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down

0 comments on commit 6e1cfa4

Please sign in to comment.