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.

From-SVN: r125112

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 488577362c92b990d483c6847b4a3e3599f4c2a3..7db46b252f1c7bbd8e8236b027e844b6b94b0614 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+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.
+       
 2007-05-25  Paolo Carlini  <pcarlini@suse.de>
 
        * config/locale/gnu/c_locale.h (__convert_from_v): Fix typo.

diff --git a/libstdc++-v3/include/c_global/cwchar b/libstdc++-v3/include/c_global/cwchar
index 6e867342478ee257d8b5c69841579db5710eefba..c49ebbd60fcdddeb1e1c556313ea6194108126f3 100644 (file)
--- a/libstdc++-v3/include/c_global/cwchar
+++ b/libstdc++-v3/include/c_global/cwchar
@@ -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>

diff --git a/libstdc++-v3/include/c_std/cwchar b/libstdc++-v3/include/c_std/cwchar
index 20cb8041e790272b53cdf8a89f83c15d1ac5cc25..19ce17deceb06580d2249192fe136d7b9a3ec1af 100644 (file)
--- a/libstdc++-v3/include/c_std/cwchar
+++ b/libstdc++-v3/include/c_std/cwchar
@@ -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>

diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h
index 869aa4245ec5230880fd0f249b4383e5dbeb745e..bb2707d376fede03344a2bcd7e0b442e92c8ce50 100644 (file)
--- a/libstdc++-v3/include/ext/throw_allocator.h
+++ b/libstdc++-v3/include/ext/throw_allocator.h
@@ -55,6 +55,7 @@
 #define _THROW_ALLOCATOR_H 1
 
 #include <cmath>
+#include <ctime>
 #include <map>
 #include <set>
 #include <string>

diff --git a/libstdc++-v3/include/tr1/boost_shared_ptr.h b/libstdc++-v3/include/tr1/boost_shared_ptr.h
index d90e6ff81713a0bf67898454ad90ccd1b10184ab..0e56af56efc48a7e85a6de84ac047c5c005813ff 100644 (file)
--- a/libstdc++-v3/include/tr1/boost_shared_ptr.h
+++ b/libstdc++-v3/include/tr1/boost_shared_ptr.h
@@ -194,7 +194,6 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
        }
     }
 
-#ifdef __GTHREADS
   template<>
     inline void
     _Sp_counted_base<_S_mutex>::
@@ -207,7 +206,6 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
          __throw_bad_weak_ptr();
        }
     }
-#endif
 
   template<> 
     inline void