Tagging 11

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/tags/libcpp-11@121003 91177308-0d34-0410-b5e6-96231b3b80d8

src/exception.cpp

@@ -38,7 +38,7 @@ std::get_unexpected() throw()
 void
 std::unexpected()
 {
-    (*__unexpected_handler)();
+    (*std::get_unexpected())();
     // unexpected handler should not return
     std::terminate();
 }
@@ -62,7 +62,7 @@ std::terminate()
     try
     {
 #endif  // _LIBCPP_NO_EXCEPTIONS
-        (*__terminate_handler)();
+        (*std::get_terminate())();
         // handler should not return
         ::abort ();
 #ifndef _LIBCPP_NO_EXCEPTIONS

src/new.cpp

@@ -36,8 +36,9 @@ operator new(std::size_t size) throw (std::bad_alloc)
     {
         // If malloc fails and there is a new_handler,
         // call it to try free up memory.
-        if (__new_handler)
-            __new_handler();
+        std::new_handler nh = std::get_new_handler();
+        if (nh)
+            nh();
         else
 #ifndef _LIBCPP_NO_EXCEPTIONS
             throw std::bad_alloc();