diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 16:01:04 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 16:01:04 -0700 |
| commit | 00c2e03551a61ca76bdb303f1c007845f8a6dbd6 (patch) | |
| tree | 51a3fb38eff156561441960606533fd0c1be71df /system/include/libcxx/__debug | |
| parent | 36600f34ef0ec2cf75165be3753567e256f514db (diff) | |
| parent | 2787d1f7d01afb598ed56c4d52dab876e0a34a74 (diff) | |
Merge pull request #1009 from waywardmonkeys/another-libcxx-update1.3.6
Another libcxx update
Diffstat (limited to 'system/include/libcxx/__debug')
| -rw-r--r-- | system/include/libcxx/__debug | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/system/include/libcxx/__debug b/system/include/libcxx/__debug index 4a0e3cec..0d631bf0 100644 --- a/system/include/libcxx/__debug +++ b/system/include/libcxx/__debug @@ -16,7 +16,9 @@ # include <cstdlib> # include <cstdio> # include <cstddef> -# define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : (_VSTD::printf("%s\n", m), _VSTD::abort())) +# ifndef _LIBCPP_ASSERT +# define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : (_VSTD::printf("%s\n", m), _VSTD::abort())) +# endif #endif @@ -24,9 +26,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD -struct _LIBCPP_VISIBLE __c_node; +struct _LIBCPP_TYPE_VIS __c_node; -struct _LIBCPP_VISIBLE __i_node +struct _LIBCPP_TYPE_VIS __i_node { void* __i_; __i_node* __next_; @@ -40,7 +42,7 @@ struct _LIBCPP_VISIBLE __i_node ~__i_node(); }; -struct _LIBCPP_VISIBLE __c_node +struct _LIBCPP_TYPE_VIS __c_node { void* __c_; __c_node* __next_; @@ -117,7 +119,7 @@ _C_node<_Cont>::__subscriptable(const void* __i, ptrdiff_t __n) const return _Cp->__subscriptable(__j, __n); } -class _LIBCPP_VISIBLE __libcpp_db +class _LIBCPP_TYPE_VIS __libcpp_db { __c_node** __cbeg_; __c_node** __cend_; @@ -176,11 +178,11 @@ private: _LIBCPP_HIDDEN __i_node* __find_iterator(const void* __i) const; - friend _LIBCPP_VISIBLE __libcpp_db* __get_db(); + friend _LIBCPP_FUNC_VIS __libcpp_db* __get_db(); }; -_LIBCPP_VISIBLE __libcpp_db* __get_db(); -_LIBCPP_VISIBLE const __libcpp_db* __get_const_db(); +_LIBCPP_FUNC_VIS __libcpp_db* __get_db(); +_LIBCPP_FUNC_VIS const __libcpp_db* __get_const_db(); _LIBCPP_END_NAMESPACE_STD |