From e1227692dde1874906f7b07fd60101336efdc0fa Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 18 Sep 2017 21:00:32 +0100
Subject: [PATCH] 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
---
 libstdc++-v3/ChangeLog                                 | 4 ++++
 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 c83f0758beb..28a9609103e 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 28c881ccc79..d90cd27f482 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");
-- 
2.30.2