From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-294420-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 4140 invoked by alias); 14 Jun 2011 20:05:54 -0000
Received: (qmail 4127 invoked by uid 22791); 14 Jun 2011 20:05:52 -0000
X-SWARE-Spam-Status: No, hits=-2.2 required=5.0	tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from smtp-out.google.com (HELO smtp-out.google.com) (74.125.121.67)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 14 Jun 2011 20:05:39 +0000
Received: from hpaq6.eem.corp.google.com (hpaq6.eem.corp.google.com [172.25.149.6])	by smtp-out.google.com with ESMTP id p5EK5bpW030865	for <gcc-patches@gcc.gnu.org>; Tue, 14 Jun 2011 13:05:37 -0700
Received: from ywf7 (ywf7.prod.google.com [10.192.6.7])	by hpaq6.eem.corp.google.com with ESMTP id p5EK5Wi2025367	(version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT)	for <gcc-patches@gcc.gnu.org>; Tue, 14 Jun 2011 13:05:36 -0700
Received: by ywf7 with SMTP id 7so3521656ywf.41        for <gcc-patches@gcc.gnu.org>; Tue, 14 Jun 2011 13:05:36 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.150.31.4 with SMTP id e4mr8096388ybe.127.1308081936203; Tue, 14 Jun 2011 13:05:36 -0700 (PDT)
Received: by 10.151.142.15 with HTTP; Tue, 14 Jun 2011 13:05:36 -0700 (PDT)
In-Reply-To: <BANLkTikNi6RbK47vQHdJhfRMHkW+y4jGayJr4khAxRvtZiakEQ@mail.gmail.com>
References: <20110614184508.2E50B1695C7@enki.mtv.corp.google.com>	<BANLkTinO3+ZM-PBjv9FRPXxCOFufngOWDA@mail.gmail.com>	<BANLkTikNi6RbK47vQHdJhfRMHkW+y4jGayJr4khAxRvtZiakEQ@mail.gmail.com>
Date: Tue, 14 Jun 2011 20:27:00 -0000
Message-ID: <BANLkTin7hunZNjwoy4xc0kGVsYZBXNCXmQ@mail.gmail.com>
Subject: Re: [google] Merge r173574 to google/gcc-4_6 to fix an incompatibility between C++98 and C++0x (issue4592057)
From: Diego Novillo <dnovillo@google.com>
To: Jeffrey Yasskin <jyasskin@google.com>
Cc: reply@codereview.appspotmail.com, gcc-patches@gcc.gnu.org
Content-Type: text/plain; charset=UTF-8
X-System-Of-Record: true
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
X-SW-Source: 2011-06/txt/msg01105.txt.bz2

On Tue, Jun 14, 2011 at 15:59, Jeffrey Yasskin <jyasskin@google.com> wrote:

> It's already in trunk, so my impression was that it was going to be
> automatically merged to google/main. I only need a manual merge to get
> it into our release branches.

Yeah, in this case it's not too different since we'll be switching
google/main to trunk soonish.

OK for google/gcc-4_6.


Diego.