Attachment 934733 Details for Bug 1123103 – Fix LLVM_NOEXCEPT annotation for Error.cpp files

[patch] Fix LLVM_NOEXCEPT annotation for Error.cpp files

llvm-3.5-noexcept-fix.patch (text/plain), 1.71 KB, created by Zoltan Boszormenyi on 2014-09-05 10:34:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zoltan Boszormenyi

Created: 2014-09-05 10:34:26 UTC

Size: 1.71 KB

patch

obsolete

>The LLVM_NOEXCEPT annotation is needed otherwise compilation fails
>with this error for several files:
>
>Error.cpp:23:46: error: declaration of âvirtual const char* {anonymous}::_obj2yaml_error_category::name() constâ has a different exception specifier
> const char *_obj2yaml_error_category::name() const { return "obj2yaml"; }
>                                              ^
>Error.cpp:18:15: error: from previous declaration âvirtual const char* {anonymous}::_obj2yaml_error_category::name() const noexceptâ
>   const char *name() const LLVM_NOEXCEPT override;
>               ^
>
>--- llvm-3.5.0.src/lib/Object/Error.cpp~	2014-06-13 17:36:17.000000000 +0200
>+++ llvm-3.5.0.src/lib/Object/Error.cpp	2014-09-05 09:48:04.957449352 +0200
>@@ -25,7 +25,7 @@
> };
> }
> 
>-const char *_object_error_category::name() const {
>+const char *_object_error_category::name() const LLVM_NOEXCEPT {
>   return "llvm.object";
> }
> 
>--- llvm-3.5.0.src/tools/llvm-readobj/Error.cpp~	2014-06-13 17:36:17.000000000 +0200
>+++ llvm-3.5.0.src/tools/llvm-readobj/Error.cpp	2014-09-05 11:33:52.991208309 +0200
>@@ -24,7 +24,7 @@
> };
> } // namespace
> 
>-const char *_readobj_error_category::name() const {
>+const char *_readobj_error_category::name() const LLVM_NOEXCEPT {
>   return "llvm.readobj";
> }
> 
>--- llvm-3.5.0.src/tools/obj2yaml/Error.cpp~	2014-06-13 17:36:17.000000000 +0200
>+++ llvm-3.5.0.src/tools/obj2yaml/Error.cpp	2014-09-05 11:47:59.591374015 +0200
>@@ -20,7 +20,7 @@
> };
> } // namespace
> 
>-const char *_obj2yaml_error_category::name() const { return "obj2yaml"; }
>+const char *_obj2yaml_error_category::name() const LLVM_NOEXCEPT { return "obj2yaml"; }
> 
> std::string _obj2yaml_error_category::message(int ev) const {
>   switch (static_cast<obj2yaml_error>(ev)) {

Actions: View | Diff

Attachments on bug 1123103: 934733