diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-01-26 20:35:32 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-01-26 20:35:32 +0000 |
| commit | 1f3810623fc7adbff149585a49a3f174dafdea81 (patch) | |
| tree | f1bb3fb888ce815570d5bab6ba43315e1d83940d | |
| parent | b47f74818094fabd8f150fb4d6d0fa8a6c52cde1 (diff) | |
Improve the extension warning for the use of ref-qualifiers, to
distinguish them from rvalue references. Using the rvalue-references
warning was weird when the ref-qualifier was '&'.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124316 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 2 | ||||
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 4 | ||||
| -rw-r--r-- | test/Parser/cxx0x-in-cxx98.cpp | 10 |
3 files changed, 14 insertions, 2 deletions
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index f8e67199a9..7ce5017e18 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -160,6 +160,8 @@ def err_illegal_decl_reference_to_reference : Error< "%0 declared as a reference to a reference">; def ext_rvalue_reference : ExtWarn< "rvalue references are a C++0x extension">, InGroup<CXX0x>; +def ext_ref_qualifier : ExtWarn< + "reference qualifiers on functions are a C++0x extension">, InGroup<CXX0x>; def ext_inline_namespace : ExtWarn< "inline namespaces are a C++0x feature">, InGroup<CXX0x>; def err_argument_required_after_attribute : Error< diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 29f9921217..c4fce66b65 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -3102,7 +3102,7 @@ void Parser::ParseFunctionDeclarator(SourceLocation LParenLoc, Declarator &D, // Parse ref-qualifier[opt] if (Tok.is(tok::amp) || Tok.is(tok::ampamp)) { if (!getLang().CPlusPlus0x) - Diag(Tok, diag::ext_rvalue_reference); + Diag(Tok, diag::ext_ref_qualifier); RefQualifierIsLValueRef = Tok.is(tok::amp); RefQualifierLoc = ConsumeToken(); @@ -3353,7 +3353,7 @@ void Parser::ParseFunctionDeclarator(SourceLocation LParenLoc, Declarator &D, // Parse ref-qualifier[opt] if (Tok.is(tok::amp) || Tok.is(tok::ampamp)) { if (!getLang().CPlusPlus0x) - Diag(Tok, diag::ext_rvalue_reference); + Diag(Tok, diag::ext_ref_qualifier); RefQualifierIsLValueRef = Tok.is(tok::amp); RefQualifierLoc = ConsumeToken(); diff --git a/test/Parser/cxx0x-in-cxx98.cpp b/test/Parser/cxx0x-in-cxx98.cpp new file mode 100644 index 0000000000..e0cbc23f58 --- /dev/null +++ b/test/Parser/cxx0x-in-cxx98.cpp @@ -0,0 +1,10 @@ +// RUN: %clang_cc1 -std=c++98 -fsyntax-only -verify %s + +inline namespace N { // expected-warning{{inline namespaces are a C++0x feature}} +struct X { + template<typename ...Args> // expected-warning{{variadic templates are a C++0x extension}} + void f(Args &&...) &; // expected-warning{{rvalue references are a C++0x extension}} \ + // expected-warning{{reference qualifiers on functions are a C++0x extension}} +}; +} + |