aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2010-07-25 16:44:38 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2010-07-25 17:44:38 +0100
commit20b84bef2b603adfc1a079de6575021c3529077f (patch)
treebb2e19bb0c2e46022cd77ad098983ad7f3fb4399
parent85c28850437c5446d4a0df004e0441b8bc7f757b (diff)
downloadgcc-20b84bef2b603adfc1a079de6575021c3529077f.zip
gcc-20b84bef2b603adfc1a079de6575021c3529077f.tar.gz
gcc-20b84bef2b603adfc1a079de6575021c3529077f.tar.bz2
re PR libstdc++/45060 (Wreorder warning in bits/hashtable.h)
2010-07-25 Jonathan Wakely <jwakely.gcc@gmail.com> PR libstdc++/45060 * include/bits/hashtable.h (_Hashtable::_Hashtable(_Hashtable&&)): Reorder mem-initializers. From-SVN: r162515
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/bits/hashtable.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a5e61f7..64fc3e6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-25 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ PR libstdc++/45060
+ * include/bits/hashtable.h (_Hashtable::_Hashtable(_Hashtable&&)):
+ Reorder mem-initializers.
+
2010-07-22 Benjamin Kosnik <bkoz@redhat.com>
DocBook 4.5 to 5.0 transition.
diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h
index c7aceb1..cbc67ba 100644
--- a/libstdc++-v3/include/bits/hashtable.h
+++ b/libstdc++-v3/include/bits/hashtable.h
@@ -651,10 +651,10 @@ namespace std
_H1, _H2, _Hash, __chc>(__ht),
__detail::_Map_base<_Key, _Value, _ExtractKey, __uk, _Hashtable>(__ht),
_M_node_allocator(__ht._M_node_allocator),
+ _M_buckets(__ht._M_buckets),
_M_bucket_count(__ht._M_bucket_count),
_M_element_count(__ht._M_element_count),
- _M_rehash_policy(__ht._M_rehash_policy),
- _M_buckets(__ht._M_buckets)
+ _M_rehash_policy(__ht._M_rehash_policy)
{
size_type __n_bkt = __ht._M_rehash_policy._M_next_bkt(0);
__ht._M_buckets = __ht._M_allocate_buckets(__n_bkt);