summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2017-03-08 20:06:01 +0000
committerEric Fiselier <eric@efcs.ca>2017-03-08 20:06:01 +0000
commite05469392eb036847555925060751c3be232d53b (patch)
tree8313b5d56402a0ed0c2df055bcc790d920c992c1 /libcxx/src
parentfcd208fdb3309a8d8637e7017415581f3eb62e18 (diff)
downloadbcm5719-llvm-e05469392eb036847555925060751c3be232d53b.tar.gz
bcm5719-llvm-e05469392eb036847555925060751c3be232d53b.zip
Fix PR32183 - Wrap GCC exception implementation in missing namespace std
llvm-svn: 297306
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/support/runtime/exception_glibcxx.ipp2
-rw-r--r--libcxx/src/support/runtime/exception_pointer_glibcxx.ipp4
2 files changed, 5 insertions, 1 deletions
diff --git a/libcxx/src/support/runtime/exception_glibcxx.ipp b/libcxx/src/support/runtime/exception_glibcxx.ipp
index 365dc40a7ea..0f78932f6f9 100644
--- a/libcxx/src/support/runtime/exception_glibcxx.ipp
+++ b/libcxx/src/support/runtime/exception_glibcxx.ipp
@@ -35,4 +35,4 @@ bad_typeid::bad_typeid() _NOEXCEPT
{
}
-} // namespace
+} // namespace std
diff --git a/libcxx/src/support/runtime/exception_pointer_glibcxx.ipp b/libcxx/src/support/runtime/exception_pointer_glibcxx.ipp
index 30bd6b61f08..9d20dfe4862 100644
--- a/libcxx/src/support/runtime/exception_pointer_glibcxx.ipp
+++ b/libcxx/src/support/runtime/exception_pointer_glibcxx.ipp
@@ -17,6 +17,8 @@
// stable ABI), and its rethrow_exception(std::__exception_ptr::exception_ptr)
// function.
+namespace std {
+
namespace __exception_ptr
{
@@ -72,3 +74,5 @@ void rethrow_exception(exception_ptr p)
{
rethrow_exception(reinterpret_cast<__exception_ptr::exception_ptr&>(p));
}
+
+} // namespace std
OpenPOWER on IntegriCloud