Make regex and any assert when they should throw an exception _but_ the user has decreed 'no exceptions'. This matches the behavior of string and vector

llvm-svn: 245239
This commit is contained in:
Marshall Clow 2015-08-17 21:14:16 +00:00
parent 83f4bb23c4
commit 05ddbffbf3
2 changed files with 6 additions and 2 deletions

View File

@ -82,6 +82,7 @@ inline namespace fundamentals_v1 {
#include <typeinfo>
#include <type_traits>
#include <cstdlib>
#include <cassert>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
@ -106,7 +107,7 @@ inline void __throw_bad_any_cast()
#ifndef _LIBCPP_NO_EXCEPTIONS
throw bad_any_cast();
#else
_VSTD::abort();
assert(!"bad_any_cast");
#endif
}

View File

@ -762,6 +762,7 @@ typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
#include <memory>
#include <vector>
#include <deque>
#include <cassert>
#include <__undef_min_max>
@ -960,7 +961,9 @@ _LIBCPP_ALWAYS_INLINE
void __throw_regex_error()
{
#ifndef _LIBCPP_NO_EXCEPTIONS
throw regex_error(_Ev);
throw regex_error(_Ev);
#else
assert(!"regex_error");
#endif
}