From a57562d321037b6acfa4090e6bf06dbf4ab13316 Mon Sep 17 00:00:00 2001 From: paolo Date: Sun, 23 Apr 2006 14:54:26 +0000 Subject: [PATCH] 2006-04-23 Marc Glisse PR libstdc++/27199 * ext/pool_allocator.h: Add using declarations for size_t, ptrdiff_t. * ext/bitmap_allocator.h: Likewise; qualify with std::. * ext/new_allocator.h: Likewise. * ext/malloc_allocator.h: Likewise. * ext/array_allocator.h: Likewise. * ext/mt_allocator.h: Likewise. * ext/functional: Likewise for size_t. * ext/debug_allocator.h: Likewise. * bits/char_traits.h: Qualify with std:: size_t. * debug/hash_multimap.h: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113195 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 14 ++++++++++++++ libstdc++-v3/include/bits/char_traits.h | 2 +- libstdc++-v3/include/debug/hash_multimap.h | 2 +- libstdc++-v3/include/ext/array_allocator.h | 3 +++ libstdc++-v3/include/ext/bitmap_allocator.h | 13 ++++++++----- libstdc++-v3/include/ext/debug_allocator.h | 2 ++ libstdc++-v3/include/ext/functional | 1 + libstdc++-v3/include/ext/malloc_allocator.h | 3 +++ libstdc++-v3/include/ext/mt_allocator.h | 3 +++ libstdc++-v3/include/ext/new_allocator.h | 3 +++ libstdc++-v3/include/ext/pool_allocator.h | 3 +++ 11 files changed, 42 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a9ed643..27437c5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2006-04-23 Marc Glisse + + PR libstdc++/27199 + * ext/pool_allocator.h: Add using declarations for size_t, ptrdiff_t. + * ext/bitmap_allocator.h: Likewise; qualify with std::. + * ext/new_allocator.h: Likewise. + * ext/malloc_allocator.h: Likewise. + * ext/array_allocator.h: Likewise. + * ext/mt_allocator.h: Likewise. + * ext/functional: Likewise for size_t. + * ext/debug_allocator.h: Likewise. + * bits/char_traits.h: Qualify with std:: size_t. + * debug/hash_multimap.h: Likewise. + 2006-04-23 Paolo Carlini * docs/html/ext/lwg-active.html, lwg-defects.html: Import Revision 42. diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 410e01b..4431036 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -148,7 +148,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) char_traits<_CharT>:: compare(const char_type* __s1, const char_type* __s2, std::size_t __n) { - for (size_t __i = 0; __i < __n; ++__i) + for (std::size_t __i = 0; __i < __n; ++__i) if (lt(__s1[__i], __s2[__i])) return -1; else if (lt(__s2[__i], __s1[__i])) diff --git a/libstdc++-v3/include/debug/hash_multimap.h b/libstdc++-v3/include/debug/hash_multimap.h index 7bdb9d5..7340753 100644 --- a/libstdc++-v3/include/debug/hash_multimap.h +++ b/libstdc++-v3/include/debug/hash_multimap.h @@ -181,7 +181,7 @@ namespace __debug erase(const key_type& __key) { std::pair __victims = this->equal_range(__key); - size_t __num_victims = 0; + std::size_t __num_victims = 0; while (__victims.first != __victims.second) { this->erase(__victims.first++); diff --git a/libstdc++-v3/include/ext/array_allocator.h b/libstdc++-v3/include/ext/array_allocator.h index 02af578..d7e9670 100644 --- a/libstdc++-v3/include/ext/array_allocator.h +++ b/libstdc++-v3/include/ext/array_allocator.h @@ -41,6 +41,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + using std::size_t; + using std::ptrdiff_t; + /// @brief Base class. template class array_allocator_base diff --git a/libstdc++-v3/include/ext/bitmap_allocator.h b/libstdc++-v3/include/ext/bitmap_allocator.h index 6d80c99..42109b4 100644 --- a/libstdc++-v3/include/ext/bitmap_allocator.h +++ b/libstdc++-v3/include/ext/bitmap_allocator.h @@ -71,6 +71,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + using std::size_t; + using std::ptrdiff_t; + #if defined __GTHREADS namespace { @@ -238,8 +241,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) typedef _Tp* pointer; typedef _Tp& reference; typedef const _Tp& const_reference; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef size_t size_type; + typedef ptrdiff_t difference_type; typedef pointer iterator; private: @@ -396,7 +399,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) struct __mv_iter_traits<_Tp*> { typedef _Tp value_type; - typedef std::ptrdiff_t difference_type; + typedef ptrdiff_t difference_type; }; enum @@ -865,8 +868,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) class bitmap_allocator : private free_list { public: - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; + typedef size_t size_type; + typedef ptrdiff_t difference_type; typedef _Tp* pointer; typedef const _Tp* const_pointer; typedef _Tp& reference; diff --git a/libstdc++-v3/include/ext/debug_allocator.h b/libstdc++-v3/include/ext/debug_allocator.h index aa96507..43a9a87 100644 --- a/libstdc++-v3/include/ext/debug_allocator.h +++ b/libstdc++-v3/include/ext/debug_allocator.h @@ -52,6 +52,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + using std::size_t; + /** * @brief A meta-allocator with debugging bits, as per [20.4]. * diff --git a/libstdc++-v3/include/ext/functional b/libstdc++-v3/include/ext/functional index c100f59..f159e11 100644 --- a/libstdc++-v3/include/ext/functional +++ b/libstdc++-v3/include/ext/functional @@ -67,6 +67,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + using std::size_t; using std::unary_function; using std::binary_function; using std::mem_fun1_t; diff --git a/libstdc++-v3/include/ext/malloc_allocator.h b/libstdc++-v3/include/ext/malloc_allocator.h index 8143539..0f23e06 100644 --- a/libstdc++-v3/include/ext/malloc_allocator.h +++ b/libstdc++-v3/include/ext/malloc_allocator.h @@ -40,6 +40,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + using std::size_t; + using std::ptrdiff_t; + /** * @brief An allocator that uses malloc. * diff --git a/libstdc++-v3/include/ext/mt_allocator.h b/libstdc++-v3/include/ext/mt_allocator.h index fb7e370..0b557ba 100644 --- a/libstdc++-v3/include/ext/mt_allocator.h +++ b/libstdc++-v3/include/ext/mt_allocator.h @@ -42,6 +42,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + using std::size_t; + using std::ptrdiff_t; + typedef void (*__destroy_handler)(void*); /// @brief Base class for pool object. diff --git a/libstdc++-v3/include/ext/new_allocator.h b/libstdc++-v3/include/ext/new_allocator.h index b761b00..938783c 100644 --- a/libstdc++-v3/include/ext/new_allocator.h +++ b/libstdc++-v3/include/ext/new_allocator.h @@ -39,6 +39,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + using std::size_t; + using std::ptrdiff_t; + /** * @brief An allocator that uses global new, as per [20.4]. * diff --git a/libstdc++-v3/include/ext/pool_allocator.h b/libstdc++-v3/include/ext/pool_allocator.h index e11c166..a9f060a 100644 --- a/libstdc++-v3/include/ext/pool_allocator.h +++ b/libstdc++-v3/include/ext/pool_allocator.h @@ -56,6 +56,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + using std::size_t; + using std::ptrdiff_t; + /** * @brief Base class for __pool_alloc. * -- 2.7.4