From patchwork Fri Jan 28 15:46:00 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Paolo Carlini <paolo.carlini@oracle.com>
X-Patchwork-Id: 80857
Return-Path: 
 <gcc-patches-return-284086-incoming=patchwork.ozlabs.org@gcc.gnu.org>
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 C5AD3B7105
	for <incoming@patchwork.ozlabs.org>;
	Sat, 29 Jan 2011 02:46:20 +1100 (EST)
Received: (qmail 3327 invoked by alias); 28 Jan 2011 15:46:13 -0000
Received: (qmail 3308 invoked by uid 22791); 28 Jan 2011 15:46:11 -0000
X-SWARE-Spam-Status: No, hits=-0.9 required=5.0	tests=AWL, BAYES_20,
	RCVD_IN_DNSWL_NONE
X-Spam-Check-By: sourceware.org
Received: from vsmtp1.tin.it (HELO vsmtp1.tin.it) (212.216.176.141) by
	sourceware.org (qpsmtpd/0.43rc1) with ESMTP;
	Fri, 28 Jan 2011 15:46:04 +0000
Received: from [192.168.0.4] (79.53.13.55) by vsmtp1.tin.it (8.0.022) id
	4CFE55C70471AAA6; Fri, 28 Jan 2011 16:46:01 +0100
Message-ID: <4D42E4B8.5070901@oracle.com>
Date: Fri, 28 Jan 2011 16:46:00 +0100
From: Paolo Carlini <paolo.carlini@oracle.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.16) Gecko/20101125 SUSE/3.0.11 Thunderbird/3.0.11
MIME-Version: 1.0
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
CC: libstdc++ <libstdc++@gcc.gnu.org>
Subject: [v3] Two minor tweaks to atomic_base.h
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-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@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
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Hi,

noticed while analyzing libstdc++/46914. I'll commit when regtesting on
x86_64-linux without PCHs completes.

Paolo.

//////////////////
2011-01-28  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/atomic_base.h: Do not include <stddef.h>.
	(kill_dependency): Uglify ret.

Index: include/bits/atomic_base.h
===================================================================
--- include/bits/atomic_base.h	(revision 169358)
+++ include/bits/atomic_base.h	(working copy)
@@ -1,6 +1,6 @@
 // -*- C++ -*- header.
 
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -33,7 +33,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <stddef.h>
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -72,8 +71,8 @@
     inline _Tp
     kill_dependency(_Tp __y)
     {
-      _Tp ret(__y);
-      return ret;
+      _Tp __ret(__y);
+      return __ret;
     }
 
   /**