stl_algobase.h (lexicographical_compare): Fix concept check.

2005-01-12  Paolo Carlini  <pcarlini@suse.de>

        * include/bits/stl_algobase.h (lexicographical_compare):
        Fix concept check.

[[Split portion of a mixed commit.]]

From-SVN: r93231.1

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 51a2de4ff7ae2368e73d3304079baee3dcb7792f..abc6803251bd67bfd7056b514bfb36831448e43d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-12  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/stl_algobase.h (lexicographical_compare):
+       Fix concept check.
+
 2005-01-02  Chris Jefferson  <chris@bubblescope.net>
 
        * include/bits/stl_algobase.h (mismatch): Correct concept check.

diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index c7e8152fdf45669b1b0e40bba3c4d04c316e644f..d482529bf9ef6203100460a653f975197064ed88 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -746,10 +746,12 @@ namespace std
       // concept requirements
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
       __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-           typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator1>::value_type,
            typename iterator_traits<_InputIterator2>::value_type>)
+      __glibcxx_function_requires(_LessThanOpConcept<
+           typename iterator_traits<_InputIterator2>::value_type,
+           typename iterator_traits<_InputIterator1>::value_type>)
       __glibcxx_requires_valid_range(__first1, __last1);
       __glibcxx_requires_valid_range(__first2, __last2);