diff options
| author | theraven <theraven@FreeBSD.org> | 2013-07-10 16:28:24 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2013-07-10 16:28:24 +0000 |
| commit | 214e4f8fe625ad54aac3b215909e0b994a5768ec (patch) | |
| tree | f757844d307e5ebbf92ab857f2376cceb7807147 /contrib/libc++/include/iterator | |
| parent | c660176671bf640bee3fd09dbfa32ad187a9b942 (diff) | |
| download | FreeBSD-src-214e4f8fe625ad54aac3b215909e0b994a5768ec.zip FreeBSD-src-214e4f8fe625ad54aac3b215909e0b994a5768ec.tar.gz | |
Import new libcxxrt / libc++. This brings some bug fixes, including a potential race condition for static initialisers.
Diffstat (limited to 'contrib/libc++/include/iterator')
| -rw-r--r-- | contrib/libc++/include/iterator | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/libc++/include/iterator b/contrib/libc++/include/iterator index 3b078a2..dda053d 100644 --- a/contrib/libc++/include/iterator +++ b/contrib/libc++/include/iterator @@ -1135,7 +1135,14 @@ public: #endif return *__i; } - _LIBCPP_INLINE_VISIBILITY pointer operator->() const _NOEXCEPT {return &(operator*());} + _LIBCPP_INLINE_VISIBILITY pointer operator->() const _NOEXCEPT + { +#if _LIBCPP_DEBUG_LEVEL >= 2 + _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this), + "Attempted to dereference a non-dereferenceable iterator"); +#endif + return (pointer)&reinterpret_cast<const volatile char&>(*__i); + } _LIBCPP_INLINE_VISIBILITY __wrap_iter& operator++() _NOEXCEPT { #if _LIBCPP_DEBUG_LEVEL >= 2 |
