[libcxx] r288555 - Fix C++03 build

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Fri Dec 2 15:41:19 PST 2016


Author: ericwf
Date: Fri Dec  2 17:41:18 2016
New Revision: 288555

URL: http://llvm.org/viewvc/llvm-project?rev=288555&view=rev
Log:
Fix C++03 build

Modified:
    libcxx/trunk/include/memory
    libcxx/trunk/include/variant

Modified: libcxx/trunk/include/memory
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/memory?rev=288555&r1=288554&r2=288555&view=diff
==============================================================================
--- libcxx/trunk/include/memory (original)
+++ libcxx/trunk/include/memory Fri Dec  2 17:41:18 2016
@@ -3352,7 +3352,7 @@ inline size_t __hash_combine(size_t __lh
       size_t second;
     };
     typedef __scalar_hash<_PairT> _HashT;
-    const _PairT __p{__lhs, __rhs};
+    const _PairT __p = {__lhs, __rhs};
     return _HashT()(__p);
 }
 

Modified: libcxx/trunk/include/variant
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/variant?rev=288555&r1=288554&r2=288555&view=diff
==============================================================================
--- libcxx/trunk/include/variant (original)
+++ libcxx/trunk/include/variant Fri Dec  2 17:41:18 2016
@@ -216,7 +216,7 @@ namespace std { // explicitly not using
 
 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




More information about the cfe-commits mailing list