maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix build errors in C++03 caused by recent debug changes 

llvm-svn: 290653
This commit is contained in:
Eric Fiselier 2016-12-28 05:26:56 +00:00
parent ab768a85f6
commit c842c8d88c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcxx/include/__debug
View File

@ -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_;

4
libcxx/test/libcxx/debug/debug_throw.pass.cpp
View File

@ -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");
}
}