diff options
| author | Erich Keane <erich.keane@intel.com> | 2017-07-05 16:43:45 +0000 |
|---|---|---|
| committer | Erich Keane <erich.keane@intel.com> | 2017-07-05 16:43:45 +0000 |
| commit | a55f05c7b13db8177c628788ebfc6d37871adad5 (patch) | |
| tree | a4dce5a36e3f17749fb106ed7879b77814a5e109 /include/clang/Basic | |
| parent | ef0d9ebb56107e5d236dda0b8b37c32c6e216a39 (diff) | |
Address comments that escaped D33333
Patch By: Jen Yu
Differential Revision:https://reviews.llvm.org/D34671
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@307172 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic')
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 965f8fc040..65729895c1 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -6355,15 +6355,13 @@ def err_exceptions_disabled : Error< "cannot use '%0' with exceptions disabled">; def err_objc_exceptions_disabled : Error< "cannot use '%0' with Objective-C exceptions disabled">; -def warn_throw_in_noexcept_func - : Warning<"%0 has a non-throwing exception specification but can still " - "throw, resulting in unexpected program termination">, - InGroup<Exceptions>; -def note_throw_in_dtor - : Note<"destructor or deallocator has a (possibly implicit) non-throwing " - "excepton specification">; -def note_throw_in_function - : Note<"non-throwing function declare here">; +def warn_throw_in_noexcept_func : Warning< + "%0 has a non-throwing exception specification but can still throw">, + InGroup<Exceptions>; +def note_throw_in_dtor : Note< + "%select{destructor|deallocator}0 has a %select{non-throwing|implicit " + "non-throwing}1 exception specification">; +def note_throw_in_function : Note<"function declared non-throwing here">; def err_seh_try_outside_functions : Error< "cannot use SEH '__try' in blocks, captured regions, or Obj-C method decls">; def err_mixing_cxx_try_seh_try : Error< |