diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-09-18 21:00:32 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-09-18 21:00:32 +0100 |
| commit | e1227692dde1874906f7b07fd60101336efdc0fa (patch) | |
| tree | 29f40ede2a67832b2e1f15728763f61ed6e96438 | |
| parent | 05d41b0cb1947efb306b645095724624c21fcdc1 (diff) | |
| download | gcc-e1227692dde1874906f7b07fd60101336efdc0fa.zip gcc-e1227692dde1874906f7b07fd60101336efdc0fa.tar.gz gcc-e1227692dde1874906f7b07fd60101336efdc0fa.tar.bz2 | |
PR libstdc++/81468 fix test for duration conversions
PR libstdc++/81468
* testsuite/20_util/duration/cons/dr1177.cc: Fix incorrect test and
improve static assertion messages.
From-SVN: r252950
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/duration/cons/dr1177.cc | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c83f075..28a9609 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2017-09-18 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/81468 + * testsuite/20_util/duration/cons/dr1177.cc: Fix incorrect test and + improve static assertion messages. + * include/std/utility (_Itup_cat, _Make_integer_sequence): Remove. (_Build_index_tuple, make_integer_sequence): Use built-in to generate pack expansion. diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/dr1177.cc b/libstdc++-v3/testsuite/20_util/duration/cons/dr1177.cc index 28c881c..d90cd27 100644 --- a/libstdc++-v3/testsuite/20_util/duration/cons/dr1177.cc +++ b/libstdc++-v3/testsuite/20_util/duration/cons/dr1177.cc @@ -36,6 +36,6 @@ static_assert(is_constructible<duration<int>, duration<long>>{}, static_assert(!is_constructible<duration<int>, duration<int, ratio<2,3>>>{}, "cannot convert duration to one with different period"); static_assert(is_constructible<duration<float>, duration<int, ratio<2,3>>>{}, - "unless it has a floating-point representation"); -static_assert(is_constructible<duration<float>, duration<int, ratio<1,3>>>{}, - "or a period that is an integral multiple of the original"); + "... unless the result type has a floating-point representation"); +static_assert(is_constructible<duration<int, ratio<1,3>>, duration<int>>{}, + "... or the original's period is a multiple of the result's period"); |