diff options
| author | Chris Jefferson <chris@bubblescope.net> | 2005-01-02 17:49:51 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2005-01-02 17:49:51 +0000 |
| commit | ab06dedc5d1611a1f9b3e895bde3ed363f7bf623 (patch) | |
| tree | e02903595b020b56abb886e0c53d374d55929e94 | |
| parent | 155a821372f0f6533eb7e6f711bb221ce5bc136b (diff) | |
| download | gcc-ab06dedc5d1611a1f9b3e895bde3ed363f7bf623.zip gcc-ab06dedc5d1611a1f9b3e895bde3ed363f7bf623.tar.gz gcc-ab06dedc5d1611a1f9b3e895bde3ed363f7bf623.tar.bz2 | |
stl_algobase.h (mismatch): Correct concept check.
2005-01-02 Chris Jefferson <chris@bubblescope.net>
* include/bits/stl_algobase.h (mismatch): Correct concept check.
From-SVN: r92808
| -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 879ddc1..6a61a8e 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 6257890..937a242 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); |