summaryrefslogtreecommitdiffstats
path: root/libcxx/include/regex
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-08-17 21:14:16 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-08-17 21:14:16 +0000
commit05ddbffbf3eba8ef2cac067b0cf8e9c53b78855e (patch)
treed52df9643ff049f319e060bbaa6063f80021c889 /libcxx/include/regex
parent83f4bb23c47323e8d584665310ff44ca126266e3 (diff)
downloadbcm5719-llvm-05ddbffbf3eba8ef2cac067b0cf8e9c53b78855e.tar.gz
bcm5719-llvm-05ddbffbf3eba8ef2cac067b0cf8e9c53b78855e.zip
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
Diffstat (limited to 'libcxx/include/regex')
-rw-r--r--libcxx/include/regex5
1 files changed, 4 insertions, 1 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex
index 6aecd916e98..b355bbb3ac4 100644
--- a/libcxx/include/regex
+++ b/libcxx/include/regex
@@ -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
}
OpenPOWER on IntegriCloud