From fa31c108f05ffc3fe9ccc2ec116275ed1a4fa05e Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Wed, 28 Dec 2016 05:26:56 +0000 Subject: [PATCH] Fix build errors in C++03 caused by recent debug changes git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@290653 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/__debug | 5 ++++- test/libcxx/debug/debug_throw.pass.cpp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/__debug b/include/__debug index e0cef09ee..337793dc7 100644 --- a/include/__debug +++ b/include/__debug @@ -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_debug_exception; _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_; diff --git a/test/libcxx/debug/debug_throw.pass.cpp b/test/libcxx/debug/debug_throw.pass.cpp index 109f9e93b..bc5625c60 100644 --- a/test/libcxx/debug/debug_throw.pass.cpp +++ b/test/libcxx/debug/debug_throw.pass.cpp @@ -29,8 +29,8 @@ int main() } { // test that the libc++ exception type derives from std::exception - static_assert(std::is_base_of::value, "must be an exception"); + >::value), "must be an exception"); } }