Fix tests for std::clamp
* testsuite/25_algorithms/clamp/1.cc: Fix order of arguments and expected results when using predicate defining reverse order. * testsuite/25_algorithms/clamp/constexpr.cc: Likewise. From-SVN: r253051
This commit is contained in:
parent
a4f65ca8cb
commit
f3f08c3f03
|
@ -1,3 +1,9 @@
|
|||
2017-09-21 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
* testsuite/25_algorithms/clamp/1.cc: Fix order of arguments and
|
||||
expected results when using predicate defining reverse order.
|
||||
* testsuite/25_algorithms/clamp/constexpr.cc: Likewise.
|
||||
|
||||
2017-09-20 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
PR libstdc++/79162
|
||||
|
|
|
@ -30,12 +30,12 @@ void test01()
|
|||
VERIFY( y == 3 );
|
||||
VERIFY( z == 4 );
|
||||
|
||||
const int xc = std::clamp(1, 2, 4, std::greater<int>());
|
||||
const int yc = std::clamp(3, 2, 4, std::greater<int>());
|
||||
const int zc = std::clamp(5, 2, 4, std::greater<int>());
|
||||
VERIFY( xc == 4 );
|
||||
VERIFY( yc == 2 );
|
||||
VERIFY( zc == 2 );
|
||||
const int xc = std::clamp(1, 4, 2, std::greater<int>());
|
||||
const int yc = std::clamp(3, 4, 2, std::greater<int>());
|
||||
const int zc = std::clamp(5, 4, 2, std::greater<int>());
|
||||
VERIFY( xc == 2 );
|
||||
VERIFY( yc == 3 );
|
||||
VERIFY( zc == 4 );
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
@ -27,5 +27,5 @@
|
|||
# error "Feature-test macro for clamp has wrong value"
|
||||
#endif
|
||||
|
||||
static_assert(std::clamp(2, 0, 1) == 1, "");
|
||||
static_assert(std::clamp(2, 0, 1, std::greater<int>()) == 0, "");
|
||||
static_assert(std::clamp(2, 0, 1) == 1);
|
||||
static_assert(std::clamp(2, 1, 0, std::greater<int>()) == 1);
|
||||
|
|
Loading…
Reference in New Issue