Index: include/map
===================================================================
--- include/map
+++ include/map
@@ -1371,10 +1371,8 @@
 {
     __parent_pointer __parent;
     __node_base_pointer& __child = __tree_.__find_equal(__parent, __k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
     if (__child == nullptr)
-        throw out_of_range("map::at:  key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
+        _VSTD::__throw_out_of_range("map::at:  key not found");
     return static_cast<__node_pointer>(__child)->__value_.__cc.second;
 }
 
@@ -1384,10 +1382,8 @@
 {
     __parent_pointer __parent;
     __node_base_pointer __child = __tree_.__find_equal(__parent, __k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
     if (__child == nullptr)
-        throw out_of_range("map::at:  key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
+        _VSTD::__throw_out_of_range("map::at:  key not found");
     return static_cast<__node_pointer>(__child)->__value_.__cc.second;
 }