projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7fdf6c6)
pool_allocator.h: Add missing std:: qualifications.
authorMarc Glisse <marc.glisse@normalesup.org>
Wed, 10 May 2006 15:43:20 +0000 (15:43 +0000)
committerPaolo Carlini <paolo@gcc.gnu.org>
Wed, 10 May 2006 15:43:20 +0000 (15:43 +0000)
2006-05-10  Marc Glisse  <marc.glisse@normalesup.org>

* include/ext/pool_allocator.h: Add missing std:: qualifications.
* include/ext/mt_allocator.h: Likewise.
* include/ext/pb_assoc/detail/resize_policy/
hash_load_check_resize_trigger_imp.hpp: Likewise.
* include/ext/pb_assoc/detail/resize_policy/
hash_standard_resize_policy_imp.hpp: Likewise.
* include/ext/pb_assoc/detail/lu_policy/
counter_lu_metadata_imp.hpp: Likewise.
* include/ext/pb_assoc/detail/map_debug_base.hpp: Likewise.
* libsupc++/eh_alloc.cc: Typo: memcpy -> memset.

From-SVN: r113673

libstdc++-v3/ChangeLog patch | blob | history
libstdc++-v3/include/ext/mt_allocator.h patch | blob | history
libstdc++-v3/include/ext/pb_assoc/detail/lu_policy/counter_lu_metadata_imp.hpp patch | blob | history
libstdc++-v3/include/ext/pb_assoc/detail/map_debug_base.hpp patch | blob | history
libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp patch | blob | history
libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_standard_resize_policy_imp.hpp patch | blob | history
libstdc++-v3/include/ext/pool_allocator.h patch | blob | history
libstdc++-v3/libsupc++/eh_alloc.cc patch | blob | history

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 314c5539614e9458a7ef846796a0c073b140975b..b2694b9aa7d9d576be10238feb9d3d1e048d2acc 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-10  Marc Glisse  <marc.glisse@normalesup.org>
+
+       * include/ext/pool_allocator.h: Add missing std:: qualifications.
+       * include/ext/mt_allocator.h: Likewise.
+       * include/ext/pb_assoc/detail/resize_policy/
+       hash_load_check_resize_trigger_imp.hpp: Likewise.
+       * include/ext/pb_assoc/detail/resize_policy/
+       hash_standard_resize_policy_imp.hpp: Likewise.
+       * include/ext/pb_assoc/detail/lu_policy/
+       counter_lu_metadata_imp.hpp: Likewise.
+       * include/ext/pb_assoc/detail/map_debug_base.hpp: Likewise.
+       * libsupc++/eh_alloc.cc: Typo: memcpy -> memset.
+
 2006-05-07  Paolo Carlini  <pcarlini@suse.de>
 
        * include/tr1/type_traits (integral_constant<>::value): Define.
diff --git a/libstdc++-v3/include/ext/mt_allocator.h b/libstdc++-v3/include/ext/mt_allocator.h
index 0b557bad399be75b4a581a8dbdfd7d53720a846b..07de3eddea2a5ab0b6a97e76b0066a985d8d9448 100644 (file)
--- a/libstdc++-v3/include/ext/mt_allocator.h
+++ b/libstdc++-v3/include/ext/mt_allocator.h
@@ -1,6 +1,6 @@
 // MT-optimized allocator -*- C++ -*-
 
-// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005, 2006 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
@@ -111,7 +111,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       : _M_align(_S_align), _M_max_bytes(_S_max_bytes), _M_min_bin(_S_min_bin),
       _M_chunk_size(_S_chunk_size), _M_max_threads(_S_max_threads), 
       _M_freelist_headroom(_S_freelist_headroom), 
-      _M_force_new(getenv("GLIBCXX_FORCE_NEW") ? true : false)
+      _M_force_new(std::getenv("GLIBCXX_FORCE_NEW") ? true : false)
       { }
 
       explicit
@@ -480,7 +480,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
                             sizeof(_Tp) * size_t(_Tune::_S_chunk_size),
                             _Tune::_S_max_threads,
                             _Tune::_S_freelist_headroom,
-                            getenv("GLIBCXX_FORCE_NEW") ? true : false);
+                            std::getenv("GLIBCXX_FORCE_NEW") ? true : false);
        static pool_type _S_pool(_S_tune);
        return _S_pool;
       }
diff --git a/libstdc++-v3/include/ext/pb_assoc/detail/lu_policy/counter_lu_metadata_imp.hpp b/libstdc++-v3/include/ext/pb_assoc/detail/lu_policy/counter_lu_metadata_imp.hpp
index 28f1960be86c0aa58d0375b55e39c61a67c7badd..446b1d6c9f37ae2cdd07921224f409e70147edb1 100644 (file)
--- a/libstdc++-v3/include/ext/pb_assoc/detail/lu_policy/counter_lu_metadata_imp.hpp
+++ b/libstdc++-v3/include/ext/pb_assoc/detail/lu_policy/counter_lu_metadata_imp.hpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 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
@@ -48,7 +48,7 @@ counter_lu_metadata<
 PB_ASSOC_CLASS_C_DEC::
 operator()(size_type m_max_count) const
 {
-  return (counter_lu_metadata<Size_Type>(rand() % m_max_count));
+  return (counter_lu_metadata<Size_Type>(std::rand() % m_max_count));
 }
 
 PB_ASSOC_CLASS_T_DEC
diff --git a/libstdc++-v3/include/ext/pb_assoc/detail/map_debug_base.hpp b/libstdc++-v3/include/ext/pb_assoc/detail/map_debug_base.hpp
index 4853180a2d7330f21a7e7945089a1d3426623a87..1f7dbc07fbdebb703749a98f6be45eeb68ad56d6 100644 (file)
--- a/libstdc++-v3/include/ext/pb_assoc/detail/map_debug_base.hpp
+++ b/libstdc++-v3/include/ext/pb_assoc/detail/map_debug_base.hpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 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
@@ -154,7 +154,7 @@ namespace pb_assoc
        set_throw_prob(0);
 
       if (m_key_set.find(r_key) != m_key_set.end())
-       abort();
+       std::abort();
 
       try
        {
@@ -178,12 +178,12 @@ namespace pb_assoc
     erase_existing(const_key_reference r_key)
     {
       if (m_key_set.find(r_key) == m_key_set.end())
-       abort();
+       std::abort();
 
       m_key_set.erase(r_key);
 
       if (m_key_set.find(r_key) != m_key_set.end())
-       abort();
+       std::abort();
     }
 
     PB_ASSOC_CLASS_T_DEC
@@ -200,7 +200,7 @@ namespace pb_assoc
     check_key_exists(const_key_reference r_key) const
     {
       if (m_key_set.find(r_key) == m_key_set.end())
-       abort();
+       std::abort();
     }
 
     PB_ASSOC_CLASS_T_DEC
@@ -209,7 +209,7 @@ namespace pb_assoc
     check_key_does_not_exist(const_key_reference r_key) const
     {
       if (m_key_set.find(r_key) != m_key_set.end())
-       abort();
+       std::abort();
     }
 
     PB_ASSOC_CLASS_T_DEC
@@ -220,7 +220,7 @@ namespace pb_assoc
       const size_type key_set_size = m_key_set.size();
 
       if (size != key_set_size)
-       abort();
+       std::abort();
     }
 
     PB_ASSOC_CLASS_T_DEC
diff --git a/libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp b/libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
index e26d30b29888973f66c93f4d342e0dd76e80fa1d..e17f9c2f588aa86631d486d75b9a424091d88809 100644 (file)
--- a/libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+++ b/libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 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
@@ -336,7 +336,7 @@ void
 PB_ASSOC_CLASS_C_DEC::
 do_resize(size_type /*new_size*/)
 {
-  abort();
+  std::abort();
 }
 
 #ifdef PB_ASSOC_HT_LOAD_CHECK_RESIZE_TRIGGER_DEBUG
diff --git a/libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_standard_resize_policy_imp.hpp b/libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_standard_resize_policy_imp.hpp
index 3a6a2fd454601b16d38957e678d0b374c0ec0e77..c1df321071bec9dc28b95d3cb1f759eecfc4aafb 100644 (file)
--- a/libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+++ b/libstdc++-v3/include/ext/pb_assoc/detail/resize_policy/hash_standard_resize_policy_imp.hpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 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
@@ -306,7 +306,7 @@ PB_ASSOC_CLASS_C_DEC::
 do_resize(size_type /*new_size*/)
 {
   // Tmp Ami
-  abort();
+  std::abort();
 }
 
 PB_ASSOC_CLASS_T_DEC
diff --git a/libstdc++-v3/include/ext/pool_allocator.h b/libstdc++-v3/include/ext/pool_allocator.h
index a9f060a54605ea97198628a52363e5fe999636c1..0d6333660036cbd87f0d923c7a73d64697e343f7 100644 (file)
--- a/libstdc++-v3/include/ext/pool_allocator.h
+++ b/libstdc++-v3/include/ext/pool_allocator.h
@@ -1,6 +1,7 @@
 // Allocators -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+// 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
@@ -204,7 +205,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
          // to efficiently support threading found in basic_string.h.
          if (_S_force_new == 0)
            {
-             if (getenv("GLIBCXX_FORCE_NEW"))
+             if (std::getenv("GLIBCXX_FORCE_NEW"))
                __atomic_add(&_S_force_new, 1);
              else
                __atomic_add(&_S_force_new, -1);
diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc
index 9a922af9c2a8833735851159e7e9c48e3fdd8e59..97ecd6dadd58e4aa07f9485de60fec280584adea 100644 (file)
--- a/libstdc++-v3/libsupc++/eh_alloc.cc
+++ b/libstdc++-v3/libsupc++/eh_alloc.cc
@@ -44,7 +44,7 @@
 #if _GLIBCXX_HOSTED
 using std::free;
 using std::malloc;
-using std::memcpy;
+using std::memset;
 #else
 // In a freestanding environment, these functions may not be available
 // -- but for now, we assume that they are.