diff options
author | Chris Jefferson <chris@bubblescope.net> | 2005-01-02 17:49:51 +0000 |
---|---|---|
committer | Paolo Carlini <pcarlini@suse.de> | 2005-01-02 17:49:51 +0000 |
commit | 26d64e146c70d2c538c9c5cbd88aedc01df99e9e (patch) | |
tree | e02903595b020b56abb886e0c53d374d55929e94 /libstdc++-v3 | |
parent | 9007ee79e5b439fe34a224477dc181fecb8866d8 (diff) |
2005-01-02 Chris Jefferson <chris@bubblescope.net>
* include/bits/stl_algobase.h (mismatch): Correct concept check.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@92808 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_algobase.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 879ddc1346b..6a61a8e310c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Chris Jefferson <chris@bubblescope.net> + + * include/bits/stl_algobase.h (mismatch): Correct concept check. + 2005-01-01 Paolo Carlini <pcarlini@suse.de> * testsuite/ext/enc_filebuf/char/13189.cc: Fix, first include diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 62578902c05..937a2425982 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -1,6 +1,6 @@ // Bits and pieces used in algorithms -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -679,9 +679,8 @@ namespace std // concept requirements __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>) __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>) - __glibcxx_function_requires(_EqualityComparableConcept< - typename iterator_traits<_InputIterator1>::value_type>) - __glibcxx_function_requires(_EqualityComparableConcept< + __glibcxx_function_requires(_EqualOpConcept< + typename iterator_traits<_InputIterator1>::value_type, typename iterator_traits<_InputIterator2>::value_type>) __glibcxx_requires_valid_range(__first1, __last1); |