diff options
Diffstat (limited to 'clang/include')
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticKinds.def | 2 | ||||
| -rw-r--r-- | clang/include/clang/Parse/Parser.h | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/clang/include/clang/Basic/DiagnosticKinds.def b/clang/include/clang/Basic/DiagnosticKinds.def index ed7bdec4b57..d2c82dafc86 100644 --- a/clang/include/clang/Basic/DiagnosticKinds.def +++ b/clang/include/clang/Basic/DiagnosticKinds.def @@ -1309,8 +1309,6 @@ DIAG(err_array_new_needs_size, ERROR, "array size must be specified in new expressions") DIAG(err_bad_new_type, ERROR, "cannot allocate %select{function|incomplete|reference}1 type %0 with new") -DIAG(err_invalid_qualified_new_delete, ERROR, - "invalid use of ::%select{new|delete}0") DIAG(err_new_array_nonconst, ERROR, "only the first dimension of an allocated array may be non-const") DIAG(err_array_size_not_integral, ERROR, diff --git a/clang/include/clang/Parse/Parser.h b/clang/include/clang/Parse/Parser.h index ee748503f67..070faa16bb3 100644 --- a/clang/include/clang/Parse/Parser.h +++ b/clang/include/clang/Parse/Parser.h @@ -269,7 +269,7 @@ private: /// for expressions in C. /// /// This returns true if the token was annotated. - bool TryAnnotateTypeOrScopeToken(const Token *GlobalQualifier = 0); + bool TryAnnotateTypeOrScopeToken(); /// TryAnnotateCXXScopeToken - Like TryAnnotateTypeOrScopeToken but only /// annotates C++ scope specifiers. This returns true if the token was @@ -610,11 +610,9 @@ private: /// MaybeParseCXXScopeSpecifier - Parse global scope or nested-name-specifier. /// Returns true if a nested-name-specifier was parsed from the token stream. + /// Note that this routine will not parse ::new or ::delete. /// - /// If GlobalQualifier is non-null, then it is a :: token we should use as the - /// global qualifier. - bool MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS, - const Token *GlobalQualifier = 0); + bool MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS); //===--------------------------------------------------------------------===// // C++ 5.2p1: C++ Casts |
