aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolas Klauser <nikolasklauser@berlin.de>2023-02-01 16:05:18 +0100
committerNikolas Klauser <nikolasklauser@berlin.de>2023-02-01 16:05:18 +0100
commit157c12310cbc08d7775714ad12b819c8511065a2 (patch)
tree98f1ac00c69c618dbef77a3fe6fb92c6920d5f7f
parent591e3e6207894ebaee1e47a82fcfb3b246459f76 (diff)
downloadllvm-157c12310cbc08d7775714ad12b819c8511065a2.zip
llvm-157c12310cbc08d7775714ad12b819c8511065a2.tar.gz
llvm-157c12310cbc08d7775714ad12b819c8511065a2.tar.bz2
Revert "[libc++] Fix ODR violation with __exception_guard in mixed exceptions builds"
This reverts commit 561105fb9d3a16f7fb8c718cc5da71b11f17a144. This breaks C++03 with -fno-exceptions.
-rw-r--r--libcxx/include/__utility/exception_guard.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/__utility/exception_guard.h b/libcxx/include/__utility/exception_guard.h
index ccbf75f..737d1a6 100644
--- a/libcxx/include/__utility/exception_guard.h
+++ b/libcxx/include/__utility/exception_guard.h
@@ -89,7 +89,7 @@ private:
};
#else // _LIBCPP_NO_EXCEPTIONS
template <class _Rollback>
-struct [[gnu::abi_tag("-fno-exceptions")]] __exception_guard {
+struct __exception_guard {
__exception_guard() = delete;
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_NODEBUG explicit __exception_guard(_Rollback) {}