From 69570b6b3011b10c1293dfeaaac33a2623c52bc5 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 12 Jan 2005 19:53:13 +0000 Subject: [PATCH] stl_algobase.h (lexicographical_compare): Fix concept check. 2005-01-12 Paolo Carlini * include/bits/stl_algobase.h (lexicographical_compare): Fix concept check. [[Split portion of a mixed commit.]] From-SVN: r93231.1 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/stl_algobase.h | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 51a2de4ff7ae..abc6803251bd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2005-01-12 Paolo Carlini + + * include/bits/stl_algobase.h (lexicographical_compare): + Fix concept check. + 2005-01-02 Chris Jefferson * 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 c7e8152fdf45..d482529bf9ef 100644 --- 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); -- 2.47.2