Fix C++03 build

llvm-svn: 288555

diff --git a/libcxx/include/memory b/libcxx/include/memory
index e4cb58b..8a3237f 100644 (file)
--- a/libcxx/include/memory
+++ b/libcxx/include/memory
@@ -3352,7 +3352,7 @@ inline size_t __hash_combine(size_t __lhs, size_t __rhs) _NOEXCEPT {
       size_t second;
     };
     typedef __scalar_hash<_PairT> _HashT;
-    const _PairT __p{__lhs, __rhs};
+    const _PairT __p = {__lhs, __rhs};
     return _HashT()(__p);
 }
 

diff --git a/libcxx/include/variant b/libcxx/include/variant
index 45efc78..94c1ece 100644 (file)
--- a/libcxx/include/variant
+++ b/libcxx/include/variant
@@ -216,7 +216,7 @@ namespace std { // explicitly not using versioning namespace
 
 class _LIBCPP_EXCEPTION_ABI bad_variant_access : public exception {
 public:
-  _LIBCPP_FUNC_VIS virtual const char* what() const noexcept;
+  _LIBCPP_FUNC_VIS virtual const char* what() const _NOEXCEPT;
 };
 
 } // namespace std