[libcxx] r290653 - Fix build errors in C++03 caused by recent debug changes

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Tue Dec 27 23:26:56 2016
New Revision: 290653

URL: http://llvm.org/viewvc/llvm-project?rev=290653&view=rev
Log:
Fix build errors in C++03 caused by recent debug changes

Modified:
    libcxx/trunk/include/__debug
    libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp

Modified: libcxx/trunk/include/__debug
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__debug?rev=290653&r1=290652&r2=290653&view=diff
==============================================================================
--- libcxx/trunk/include/__debug (original)
+++ libcxx/trunk/include/__debug Tue Dec 27 23:26:56 2016
@@ -26,7 +26,7 @@
 
 #if _LIBCPP_DEBUG_LEVEL >= 1 && !defined(_LIBCPP_ASSERT)
 # define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : \
-  _VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info{__FILE__, __LINE__, #x, m}))
+  _VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info(__FILE__, __LINE__, #x, m)))
 #endif
 
 #if _LIBCPP_DEBUG_LEVEL >= 2
@@ -53,6 +53,9 @@ class _LIBCPP_EXCEPTION_ABI __libcpp_deb
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 struct _LIBCPP_TYPE_VIS_ONLY __libcpp_debug_info {
+  _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
+  __libcpp_debug_info(const char* __f, int __l, const char* __p, const char* __m)
+    : __file_(__f), __line_(__l), __pred_(__p), __msg_(__m) {}
   const char* __file_;
   int __line_;
   const char* __pred_;

Modified: libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp?rev=290653&r1=290652&r2=290653&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/debug/debug_throw.pass.cpp Tue Dec 27 23:26:56 2016
@@ -29,8 +29,8 @@ int main()
   }
   {
     // test that the libc++ exception type derives from std::exception
-    static_assert(std::is_base_of<std::exception,
+    static_assert((std::is_base_of<std::exception,
                                   std::__libcpp_debug_exception
-                  >::value, "must be an exception");
+                  >::value), "must be an exception");
   }
 }