diff options
| author | dim <dim@FreeBSD.org> | 2013-04-27 17:27:12 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2013-04-27 17:27:12 +0000 |
| commit | 8546120978e348b3bed62936eae651837ccbcafd (patch) | |
| tree | f4dbdda47a8f2e8eb8196e6a33ed834e8400837e /src/debug.cpp | |
| parent | fab14d3df75fc3af83c06ed85bb9c068f1144351 (diff) | |
| download | FreeBSD-src-8546120978e348b3bed62936eae651837ccbcafd.zip FreeBSD-src-8546120978e348b3bed62936eae651837ccbcafd.tar.gz | |
Vendor import of libc++ trunk r180598.
Diffstat (limited to 'src/debug.cpp')
| -rw-r--r-- | src/debug.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/debug.cpp b/src/debug.cpp index f3a0262..06040af 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -17,7 +17,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -_LIBCPP_VISIBLE +_LIBCPP_FUNC_VIS __libcpp_db* __get_db() { @@ -25,7 +25,7 @@ __get_db() return &db; } -_LIBCPP_VISIBLE +_LIBCPP_FUNC_VIS const __libcpp_db* __get_const_db() { @@ -110,8 +110,7 @@ __libcpp_db::__find_c_from_i(void* __i) const { RLock _(mut()); __i_node* i = __find_iterator(__i); - _LIBCPP_ASSERT(i != nullptr, "iterator constructed in translation unit with debug mode not enabled." - " #define _LIBCPP_DEBUG2 1 for that translation unit."); + _LIBCPP_ASSERT(i != nullptr, "iterator not found in debug database."); return i->__c_ != nullptr ? i->__c_->__c_ : nullptr; } @@ -302,7 +301,7 @@ __libcpp_db::__iterator_copy(void* __i, const void* __i0) __i_node* i = __find_iterator(__i); __i_node* i0 = __find_iterator(__i0); __c_node* c0 = i0 != nullptr ? i0->__c_ : nullptr; - if (i == nullptr && c0 != nullptr) + if (i == nullptr && i0 != nullptr) i = __insert_iterator(__i); __c_node* c = i != nullptr ? i->__c_ : nullptr; if (c != c0) |
