From patchwork Sun Jul 25 16:45:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 59876 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 54943B6F07 for ; Mon, 26 Jul 2010 02:46:08 +1000 (EST) Received: (qmail 10246 invoked by alias); 25 Jul 2010 16:46:01 -0000 Received: (qmail 10223 invoked by uid 22791); 25 Jul 2010 16:46:00 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mail-ww0-f51.google.com (HELO mail-ww0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 25 Jul 2010 16:45:56 +0000 Received: by wwb22 with SMTP id 22so5222518wwb.8 for ; Sun, 25 Jul 2010 09:45:53 -0700 (PDT) MIME-Version: 1.0 Received: by 10.227.27.193 with SMTP id j1mr6174960wbc.137.1280076352616; Sun, 25 Jul 2010 09:45:52 -0700 (PDT) Received: by 10.216.36.194 with HTTP; Sun, 25 Jul 2010 09:45:52 -0700 (PDT) Date: Sun, 25 Jul 2010 17:45:52 +0100 Message-ID: Subject: fix libstdc++/45060 From: Jonathan Wakely To: "libstdc++" , gcc-patches Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org PR libstdc++/45060 * include/bits/hashtable.h (_Hashtable::_Hashtable(_Hashtable&&)): Reorder mem-initializers. tested x86_64/Linux and applied to trunk Index: include/bits/hashtable.h =================================================================== --- include/bits/hashtable.h (revision 162507) +++ include/bits/hashtable.h (working copy) @@ -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);