summaryrefslogtreecommitdiffstats
path: root/libcxxabi/test
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2018-04-29 23:05:11 +0000
committerNico Weber <nicolasweber@gmx.de>2018-04-29 23:05:11 +0000
commit297ec32b86753d1b90e250d92bec0fc2f5d0a634 (patch)
treea38ab2b7b3c17ae9d49c54a2f589394ca20aeeda /libcxxabi/test
parent5731558979a669baf4a1b1841672c3d603e5232d (diff)
downloadbcm5719-llvm-297ec32b86753d1b90e250d92bec0fc2f5d0a634.tar.gz
bcm5719-llvm-297ec32b86753d1b90e250d92bec0fc2f5d0a634.zip
Move _LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS macro to build system
_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS is currently used to bring back std::unexpected, which is removed in C++17, but still needed for libc++abi for backward compatibility. This macro used to define in cxa_exception.cpp only, but actually needed for all sources that touches exceptions. So, a build-system-level macro is better fit to define this macro. https://reviews.llvm.org/D46056 Patch from Taiju Tsuiku <tzik@chromium.org>! llvm-svn: 331150
Diffstat (limited to 'libcxxabi/test')
-rw-r--r--libcxxabi/test/test_exception_storage.pass.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/libcxxabi/test/test_exception_storage.pass.cpp b/libcxxabi/test/test_exception_storage.pass.cpp
index 49c9b5d4963..ef2524f4784 100644
--- a/libcxxabi/test/test_exception_storage.pass.cpp
+++ b/libcxxabi/test/test_exception_storage.pass.cpp
@@ -7,11 +7,6 @@
//
//===----------------------------------------------------------------------===//
-// FIXME: cxa_exception.hpp directly references `std::unexpected` and friends.
-// This breaks this test when compiled in C++17. For now fix this by manually
-// re-enabling the STL functions.
-#define _LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS
-
#include <cstdlib>
#include <algorithm>
#include <iostream>
OpenPOWER on IntegriCloud