2010-03-02 Paolo Carlini <paolo.carlini@oracle.com>

	* include/debug/bitset (hash): Minor tweaks.
	* include/debug/vector (hash): Likewise.
	* include/profile/bitset (hash): Likewise.
	* include/profile/vector (hash): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157186 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f8c19e4..3b30270 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2010-03-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
+       * include/debug/bitset (hash): Minor tweaks.
+       * include/debug/vector (hash): Likewise.
+       * include/profile/bitset (hash): Likewise.
+       * include/profile/vector (hash): Likewise.
+
+2010-03-02  Paolo Carlini  <paolo.carlini@oracle.com>
+
        * include/bits/functional_hash.h (_Fnv_hash_base<>::hash): Change
        to template.
        * include/tr1/functional_hash.h (_Fnv_hash_base<>::hash): Likewise.

diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset
index 034505d..f452062 100644 (file)
--- a/libstdc++-v3/include/debug/bitset
+++ b/libstdc++-v3/include/debug/bitset
@@ -384,11 +384,11 @@ namespace __debug
   // DR 1182.
   /// std::hash specialization for bitset.
   template<size_t _Nb>
-    struct hash<std::__debug::bitset<_Nb>>
-    : public std::unary_function<std::__debug::bitset<_Nb>, size_t>
+    struct hash<__debug::bitset<_Nb>>
+    : public std::unary_function<__debug::bitset<_Nb>, size_t>
     {
       size_t
-      operator()(const std::__debug::bitset<_Nb>& __b) const
+      operator()(const __debug::bitset<_Nb>& __b) const
       { return std::hash<_GLIBCXX_STD_D::bitset<_Nb>>()(__b._M_base()); }
     };
 #endif

diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector
index e3caef5..c360197 100644 (file)
--- a/libstdc++-v3/include/debug/vector
+++ b/libstdc++-v3/include/debug/vector
@@ -542,10 +542,10 @@ namespace __debug
   /// std::hash specialization for vector<bool>.
   template<typename _Alloc>
     struct hash<__debug::vector<bool, _Alloc>>
-    : public std::unary_function<std::__debug::vector<bool, _Alloc>, size_t>
+    : public std::unary_function<__debug::vector<bool, _Alloc>, size_t>
     {
       size_t
-      operator()(const std::__debug::vector<bool, _Alloc>& __b) const
+      operator()(const __debug::vector<bool, _Alloc>& __b) const
       { return std::hash<_GLIBCXX_STD_D::vector<bool, _Alloc>>()
          (__b._M_base()); }
     };

diff --git a/libstdc++-v3/include/profile/bitset b/libstdc++-v3/include/profile/bitset
index fb47566..f6b8249 100644 (file)
--- a/libstdc++-v3/include/profile/bitset
+++ b/libstdc++-v3/include/profile/bitset
@@ -358,11 +358,11 @@ namespace __profile
   // DR 1182.
   /// std::hash specialization for bitset.
   template<size_t _Nb>
-    struct hash<std::__profile::bitset<_Nb>>
-    : public std::unary_function<std::__profile::bitset<_Nb>, size_t>
+    struct hash<__profile::bitset<_Nb>>
+    : public std::unary_function<__profile::bitset<_Nb>, size_t>
     {
       size_t
-      operator()(const std::__profile::bitset<_Nb>& __b) const
+      operator()(const __profile::bitset<_Nb>& __b) const
       { return std::hash<_GLIBCXX_STD_D::bitset<_Nb>>()(__b._M_base()); }
     };
 #endif

diff --git a/libstdc++-v3/include/profile/vector b/libstdc++-v3/include/profile/vector
index f7c1871..ad74137 100644 (file)
--- a/libstdc++-v3/include/profile/vector
+++ b/libstdc++-v3/include/profile/vector
@@ -467,10 +467,10 @@ namespace __profile
   /// std::hash specialization for vector<bool>.
   template<typename _Alloc>
     struct hash<__profile::vector<bool, _Alloc>>
-    : public std::unary_function<std::__profile::vector<bool, _Alloc>, size_t>
+    : public std::unary_function<__profile::vector<bool, _Alloc>, size_t>
     {
       size_t
-      operator()(const std::__profile::vector<bool, _Alloc>& __b) const
+      operator()(const __profile::vector<bool, _Alloc>& __b) const
       { return std::hash<_GLIBCXX_STD_D::vector<bool, _Alloc>>()
          (__b._M_base()); }
     };