Patchwork [v3] Two minor tweaks to atomic_base.h

login
register
mail settings
Submitter Paolo Carlini
Date Jan. 28, 2011, 3:46 p.m.
Message ID <4D42E4B8.5070901@oracle.com>
Download mbox | patch
Permalink /patch/80857/
State New
Headers show

Comments

Paolo Carlini - Jan. 28, 2011, 3:46 p.m.
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.

Patch

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;
     }
 
   /**