2007-10-11 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / ext / vstring_util.h

diff --git a/libstdc++-v3/include/ext/vstring_util.h b/libstdc++-v3/include/ext/vstring_util.h
index e29d8bf..ab7cf3c 100644 (file)
--- a/libstdc++-v3/include/ext/vstring_util.h
+++ b/libstdc++-v3/include/ext/vstring_util.h
@@ -42,8 +42,10 @@
 #include <debug/debug.h>
 #include <bits/stl_function.h>  // For less
 #include <bits/functexcept.h>
-#include <locale>
-#include <algorithm> // For std::distance, srd::search.
+#include <bits/localefwd.h>
+#include <bits/ostream_insert.h>
+#include <bits/stl_iterator.h>
+#include <ext/numeric_traits.h>
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
@@ -95,17 +97,6 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
          _CharT*  _M_p; // The actual data.
        };
 
-      // For use in _M_construct (_S_construct) forward_iterator_tag.
-      template<typename _Type>
-        static bool
-        _S_is_null_pointer(_Type* __ptr)
-        { return __ptr == 0; }
-
-      template<typename _Type>
-        static bool
-        _S_is_null_pointer(_Type)
-        { return false; }
-
       // When __n = 1 way faster than the general multichar
       // traits_type::copy/move/assign.
       static void
@@ -176,12 +167,12 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       {
        const difference_type __d = difference_type(__n1 - __n2);
 
-       if (__d > std::numeric_limits<int>::max())
-         return std::numeric_limits<int>::max();
-       else if (__d < std::numeric_limits<int>::min())
-         return std::numeric_limits<int>::min();
+       if (__d > __numeric_traits_integer<int>::__max)
+         return __numeric_traits_integer<int>::__max;
+       else if (__d < __numeric_traits_integer<int>::__min)
+         return __numeric_traits_integer<int>::__min;
        else
-         return int(__d);      
+         return int(__d);
       }
     };