2010-08-29 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / debug / unordered_map

diff --git a/libstdc++-v3/include/debug/unordered_map b/libstdc++-v3/include/debug/unordered_map
index 04d311d..2e2f912 100644 (file)
--- a/libstdc++-v3/include/debug/unordered_map
+++ b/libstdc++-v3/include/debug/unordered_map
@@ -78,12 +78,14 @@ namespace __debug
       : _Base(__n, __hf, __eql, __a) { }
 
       template<typename _InputIterator>
-        unordered_map(_InputIterator __f, _InputIterator __l, 
+        unordered_map(_InputIterator __first, _InputIterator __last, 
                      size_type __n = 0,
                      const hasher& __hf = hasher(), 
                      const key_equal& __eql = key_equal(), 
                      const allocator_type& __a = allocator_type())
-       : _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n,
+       : _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
+                                                                    __last)),
+               __gnu_debug::__base(__last), __n,
                __hf, __eql, __a), _Safe_base() { }
 
       unordered_map(const unordered_map& __x) 
@@ -197,7 +199,8 @@ namespace __debug
         insert(_InputIterator __first, _InputIterator __last)
         {
          __glibcxx_check_valid_range(__first, __last);
-         _Base::insert(__first, __last);
+         _Base::insert(__gnu_debug::__base(__first),
+                       __gnu_debug::__base(__last));
        }
 
       iterator
@@ -337,12 +340,14 @@ namespace __debug
       : _Base(__n, __hf, __eql, __a) { }
 
       template<typename _InputIterator>
-        unordered_multimap(_InputIterator __f, _InputIterator __l, 
+        unordered_multimap(_InputIterator __first, _InputIterator __last, 
                           size_type __n = 0,
                           const hasher& __hf = hasher(), 
                           const key_equal& __eql = key_equal(), 
                           const allocator_type& __a = allocator_type())
-       : _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n,
+       : _Base(__gnu_debug::__base(__gnu_debug::__check_valid_range(__first,
+                                                                    __last)),
+               __gnu_debug::__base(__last), __n,
                __hf, __eql, __a), _Safe_base() { }
 
       unordered_multimap(const unordered_multimap& __x) 
@@ -448,7 +453,8 @@ namespace __debug
         insert(_InputIterator __first, _InputIterator __last)
         {
          __glibcxx_check_valid_range(__first, __last);
-         _Base::insert(__first, __last);
+         _Base::insert(__gnu_debug::__base(__first),
+                       __gnu_debug::__base(__last));
        }
 
       iterator