summaryrefslogtreecommitdiffstats
path: root/libcxx/include/future
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-05-31 01:50:55 +0000
committerEric Fiselier <eric@efcs.ca>2016-05-31 01:50:55 +0000
commit5362bbb02a4c5e31b7efce541336853ddfbcbf0c (patch)
tree449981194d29660b7f8cacd4eec649a16c72926f /libcxx/include/future
parent6e891fbdd285c681a74e8f45710d15dbbdbb3583 (diff)
downloadbcm5719-llvm-5362bbb02a4c5e31b7efce541336853ddfbcbf0c.tar.gz
bcm5719-llvm-5362bbb02a4c5e31b7efce541336853ddfbcbf0c.zip
Mark LWG issue 2276 as complete. Add _LIBCPP_ASSERTS for it
llvm-svn: 271247
Diffstat (limited to 'libcxx/include/future')
-rw-r--r--libcxx/include/future2
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxx/include/future b/libcxx/include/future
index 957a23cd8d9..3bbb925863e 100644
--- a/libcxx/include/future
+++ b/libcxx/include/future
@@ -1514,6 +1514,7 @@ template <class _Rp>
void
promise<_Rp>::set_exception_at_thread_exit(exception_ptr __p)
{
+ _LIBCPP_ASSERT( __p != nullptr, "promise::set_exception_at_thread_exit: received nullptr" );
if (__state_ == nullptr)
__throw_future_error(future_errc::no_state);
__state_->set_exception_at_thread_exit(__p);
@@ -1649,6 +1650,7 @@ template <class _Rp>
void
promise<_Rp&>::set_exception_at_thread_exit(exception_ptr __p)
{
+ _LIBCPP_ASSERT( __p != nullptr, "promise::set_exception_at_thread_exit: received nullptr" );
if (__state_ == nullptr)
__throw_future_error(future_errc::no_state);
__state_->set_exception_at_thread_exit(__p);
OpenPOWER on IntegriCloud