diff options
| author | Tim Shen <timshen@google.com> | 2016-11-30 14:46:15 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-11-30 14:46:15 +0000 |
| commit | 88811a9753e9297baf6413267ccd51ff2cea2450 (patch) | |
| tree | 10b2c0cab9b3636e500bc74c10f9b40a65452575 /libstdc++-v3 | |
| parent | aec0ee116cb445f5d7bbbaff3d39f60a8f7cb118 (diff) | |
| download | gcc-88811a9753e9297baf6413267ccd51ff2cea2450.zip gcc-88811a9753e9297baf6413267ccd51ff2cea2450.tar.gz gcc-88811a9753e9297baf6413267ccd51ff2cea2450.tar.bz2 | |
Fix condition in shared_ptr assertion
2016-11-30 Tim Shen <timshen@google.com>
* include/bits/shared_ptr_base.h
(__shared_ptr_access<T, L, true, false>::operator*()): Fix assertion.
From-SVN: r243027
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/shared_ptr_base.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3498e32..349a35b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2016-11-30 Tim Shen <timshen@google.com> + + * include/bits/shared_ptr_base.h + (__shared_ptr_access<T, L, true, false>::operator*()): Fix assertion. + 2016-11-30 David Edelsohn <dje.gcc@gmail.com> * testsuite/18_support/50594.cc: XFAIL on AIX. diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index 953aa87..2fb70b7 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -1000,7 +1000,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION element_type& operator*() const noexcept { - __glibcxx_assert(_M_ptr != nullptr); + __glibcxx_assert(_M_get() != nullptr); return *_M_get(); } |