Commit 919f402c by Harti Brandt Committed by Paolo Carlini

re PR libstdc++/51209 (The template _M_find_node in hashtable.h has a bad return value)

2011-11-18  Harti Brandt  <hartmut.brandt@dlr.de>

	PR libstdc++/51209
	* include/bits/hashtable.h (_Hashtable<>::_M_find_node): Return
	nullptr when no node is found.
	* include/tr1/hashtable.h (_Hashtable<>::_M_find_node): Return
	zero when no node is found.

From-SVN: r181480
parent 112eadc7
2011-11-18 Harti Brandt <hartmut.brandt@dlr.de>
PR libstdc++/51209
* include/bits/hashtable.h (_Hashtable<>::_M_find_node): Return
nullptr when no node is found.
* include/tr1/hashtable.h (_Hashtable<>::_M_find_node): Return
zero when no node is found.
2011-11-18 Paolo Carlini <paolo.carlini@oracle.com> 2011-11-18 Paolo Carlini <paolo.carlini@oracle.com>
* src/hash-long-double-aux.cc: Rename to... * src/hash-long-double-aux.cc: Rename to...
......
...@@ -873,7 +873,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -873,7 +873,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
// Find the node whose key compares equal to k, beginning the search // Find the node whose key compares equal to k, beginning the search
// at p (usually the head of a bucket). Return nil if no node is found. // at p (usually the head of a bucket). Return nullptr if no node is found.
template<typename _Key, typename _Value, template<typename _Key, typename _Value,
typename _Allocator, typename _ExtractKey, typename _Equal, typename _Allocator, typename _ExtractKey, typename _Equal,
typename _H1, typename _H2, typename _Hash, typename _RehashPolicy, typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
...@@ -889,7 +889,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -889,7 +889,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
for (; __p; __p = __p->_M_next) for (; __p; __p = __p->_M_next)
if (this->_M_compare(__k, __code, __p)) if (this->_M_compare(__k, __code, __p))
return __p; return __p;
return false; return nullptr;
} }
// Insert v in bucket n (assumes no element with its key already present). // Insert v in bucket n (assumes no element with its key already present).
......
...@@ -813,7 +813,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -813,7 +813,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
// Find the node whose key compares equal to k, beginning the search // Find the node whose key compares equal to k, beginning the search
// at p (usually the head of a bucket). Return nil if no node is found. // at p (usually the head of a bucket). Return zero if no node is found.
template<typename _Key, typename _Value, template<typename _Key, typename _Value,
typename _Allocator, typename _ExtractKey, typename _Equal, typename _Allocator, typename _ExtractKey, typename _Equal,
typename _H1, typename _H2, typename _Hash, typename _RehashPolicy, typename _H1, typename _H2, typename _Hash, typename _RehashPolicy,
...@@ -829,7 +829,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -829,7 +829,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
for (; __p; __p = __p->_M_next) for (; __p; __p = __p->_M_next)
if (this->_M_compare(__k, __code, __p)) if (this->_M_compare(__k, __code, __p))
return __p; return __p;
return false; return 0;
} }
// Insert v in bucket n (assumes no element with its key already present). // Insert v in bucket n (assumes no element with its key already present).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment