From: Tim Shen <timshen@google.com>
Date: Wed, 30 Nov 2016 14:46:15 +0000 (+0000)
Subject: Fix condition in shared_ptr assertion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=88811a9753e9297baf6413267ccd51ff2cea2450;p=gcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3498e329238..349a35b2350 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 953aa87436e..2fb70b7a5cb 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();
       }