r245446 - in /branches/gcc-6-branch/libstdc++-v...

[redi@gcc.gnu.org]

Author: redi
Date: Tue Feb 14 20:07:26 2017
New Revision: 245446

URL: https://gcc.gnu.org/viewcvs?rev=245446&root=gcc&view=rev
Log:
PR78273 fix count to work with partitioning function

Backport from mainline
2017-01-11  Jonathan Wakely  <jwakely@redhat.com>

	PR libstdc++/78273
	* include/bits/stl_map.h (map::count<_Kt>(const _Kt&)): Don't assume
	the heterogeneous comparison can only find one match.
	* include/bits/stl_set.h (set::count<_Kt>(const _Kt&)): Likewise.
	* testsuite/23_containers/map/operations/2.cc: Test count works with
	comparison function that just partitions rather than sorting.
	* testsuite/23_containers/set/operations/2.cc: Likewise.

Modified:
    branches/gcc-6-branch/libstdc++-v3/ChangeLog
    branches/gcc-6-branch/libstdc++-v3/include/bits/stl_map.h
    branches/gcc-6-branch/libstdc++-v3/include/bits/stl_set.h
    branches/gcc-6-branch/libstdc++-v3/testsuite/23_containers/map/operations/2.cc
    branches/gcc-6-branch/libstdc++-v3/testsuite/23_containers/set/operations/2.cc