This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Couple of tweaks
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Sun, 27 May 2007 16:52:15 +0200
- Subject: [v3] Couple of tweaks
Hi,
tested x86-linux, committed to mainline.
Paolo.
/////////////
2007-05-27 Paolo Carlini <pcarlini@suse.de>
* include/tr1/boost_shared_ptr.h
(_Sp_counted_base<_S_mutex>::_M_add_ref_lock()): Do not wrap in
#ifdef __GTHREADS.
2007-05-27 Paolo Carlini <pcarlini@suse.de>
* include/c_global/cwchar: Do not include <ctime>.
* include/c_std/cwchar: Likewise.
* include/ext/throw_allocator.h: Do it here.
Index: include/tr1/boost_shared_ptr.h
===================================================================
--- include/tr1/boost_shared_ptr.h (revision 125108)
+++ include/tr1/boost_shared_ptr.h (working copy)
@@ -194,7 +194,6 @@
}
}
-#ifdef __GTHREADS
template<>
inline void
_Sp_counted_base<_S_mutex>::
@@ -207,7 +206,6 @@
__throw_bad_weak_ptr();
}
}
-#endif
template<>
inline void
Index: include/ext/throw_allocator.h
===================================================================
--- include/ext/throw_allocator.h (revision 125108)
+++ include/ext/throw_allocator.h (working copy)
@@ -55,6 +55,7 @@
#define _THROW_ALLOCATOR_H 1
#include <cmath>
+#include <ctime>
#include <map>
#include <set>
#include <string>
Index: include/c_global/cwchar
===================================================================
--- include/c_global/cwchar (revision 125108)
+++ include/c_global/cwchar (working copy)
@@ -1,6 +1,7 @@
// -*- C++ -*- forwarding header.
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -46,7 +47,6 @@
#include <bits/c++config.h>
#include <cstddef>
-#include <ctime>
#if _GLIBCXX_HAVE_WCHAR_H
#include_next <wchar.h>
Index: include/c_std/cwchar
===================================================================
--- include/c_std/cwchar (revision 125108)
+++ include/c_std/cwchar (working copy)
@@ -1,6 +1,7 @@
// -*- C++ -*- forwarding header.
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -49,7 +50,6 @@
#include <bits/c++config.h>
#include <cstddef>
-#include <ctime>
#if _GLIBCXX_HAVE_WCHAR_H
#include <wchar.h>