OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR78273 fix count to work with partitioning function 

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.

From-SVN: r244317
This commit is contained in:
Jonathan Wakely 2017-01-11 14:44:04 +00:00 committed by Jonathan Wakely
parent a92ffb3e94
commit b091b8dc0b
5 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
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.
2017-01-11 Ville Voutilainen <ville.voutilainen@gmail.com>
Reduce the size of variant, it doesn't need an index of

2
libstdc++-v3/include/bits/stl_map.h
View File

@ -1194,7 +1194,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template<typename _Kt>
auto
count(const _Kt& __x) const -> decltype(_M_t._M_count_tr(__x))
{ return _M_t._M_find_tr(__x) == _M_t.end() ? 0 : 1; }
{ return _M_t._M_count_tr(__x); }
#endif
//@}

2
libstdc++-v3/include/bits/stl_set.h
View File

@ -739,7 +739,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
auto
count(const _Kt& __x) const
-> decltype(_M_t._M_count_tr(__x))
{ return _M_t._M_find_tr(__x) == _M_t.end() ? 0 : 1; }
{ return _M_t._M_count_tr(__x); }
#endif
//@}

22
libstdc++-v3/testsuite/23_containers/map/operations/2.cc
View File

@ -133,6 +133,27 @@ test05()
VERIFY( Cmp::count == 0);
}
void
test06()
{
// PR libstdc++/78273
struct C {
bool operator()(int l, int r) const { return l < r; }
struct Partition { };
bool operator()(int l, Partition) const { return l < 2; }
bool operator()(Partition, int r) const { return 4 < r; }
using is_transparent = void;
};
std::map<int, int, C> m{ {1,0}, {2,0}, {3,0}, {4, 0}, {5, 0} };
auto n = m.count(C::Partition{});
VERIFY( n == 3 );
}
int
main()
@ -142,4 +163,5 @@ main()
test03();
test04();
test05();
test06();
}

23
libstdc++-v3/testsuite/23_containers/set/operations/2.cc
View File

@ -150,6 +150,28 @@ test06()
s.find(i);
}
void
test07()
{
// PR libstdc++/78273
struct C {
bool operator()(int l, int r) const { return l < r; }
struct Partition { };
bool operator()(int l, Partition) const { return l < 2; }
bool operator()(Partition, int r) const { return 4 < r; }
using is_transparent = void;
};
std::set<int, C> s{ 1, 2, 3, 4, 5 };
auto n = s.count(C::Partition{});
VERIFY( n == 3 );
}
int
main()
{
@ -159,4 +181,5 @@ main()
test04();
test05();
test06();
test07();
}