From 0c0d2a4cf0fbad6cb92dcf666b24fde8fac8b104 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 13 Oct 2016 15:42:09 +0100
Subject: [PATCH] Replace non-constexpr decrement in std::chrono::floor

	* include/std/chrono (floor): Replace non-constexpr operation.
	* testsuite/20_util/duration_cast/rounding.cc: Test conversion to
	durations with floating pointer representations.

From-SVN: r241122
---
 libstdc++-v3/ChangeLog                                   | 4 ++++
 libstdc++-v3/include/std/chrono                          | 2 +-
 libstdc++-v3/testsuite/20_util/duration_cast/rounding.cc | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1dac9caa868..5a8153498f4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2016-10-13  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/std/chrono (floor): Replace non-constexpr operation.
+	* testsuite/20_util/duration_cast/rounding.cc: Test conversion to
+	durations with floating pointer representations.
+
 	* src/c++11/compatibility-thread-c++0x.cc (_Bind_simple)
 	(_Bind_simple_helper, __bind_simple): Restore for ABI compat symbols.
 
diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono
index cb8c8765183..ceae7f805c1 100644
--- a/libstdc++-v3/include/std/chrono
+++ b/libstdc++-v3/include/std/chrono
@@ -224,7 +224,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
       {
 	auto __to = chrono::duration_cast<_ToDur>(__d);
 	if (__to > __d)
-	  --__to;
+	  return __to - _ToDur{1};
 	return __to;
       }
 
diff --git a/libstdc++-v3/testsuite/20_util/duration_cast/rounding.cc b/libstdc++-v3/testsuite/20_util/duration_cast/rounding.cc
index a7533230273..2a1df7478d4 100644
--- a/libstdc++-v3/testsuite/20_util/duration_cast/rounding.cc
+++ b/libstdc++-v3/testsuite/20_util/duration_cast/rounding.cc
@@ -27,6 +27,8 @@
 using namespace std::chrono_literals;
 using std::chrono::seconds;
 
+using fp_seconds = std::chrono::duration<float>;
+
 static_assert( std::chrono::floor<seconds>(1000ms) == 1s );
 static_assert( std::chrono::floor<seconds>(1001ms) == 1s );
 static_assert( std::chrono::floor<seconds>(1500ms) == 1s );
@@ -34,6 +36,7 @@ static_assert( std::chrono::floor<seconds>(1999ms) == 1s );
 static_assert( std::chrono::floor<seconds>(2000ms) == 2s );
 static_assert( std::chrono::floor<seconds>(2001ms) == 2s );
 static_assert( std::chrono::floor<seconds>(2500ms) == 2s );
+static_assert( std::chrono::floor<fp_seconds>(500ms) == fp_seconds{0.5f} );
 
 static_assert( std::chrono::ceil<seconds>(1000ms) == 1s );
 static_assert( std::chrono::ceil<seconds>(1001ms) == 2s );
@@ -42,6 +45,7 @@ static_assert( std::chrono::ceil<seconds>(1999ms) == 2s );
 static_assert( std::chrono::ceil<seconds>(2000ms) == 2s );
 static_assert( std::chrono::ceil<seconds>(2001ms) == 3s );
 static_assert( std::chrono::ceil<seconds>(2500ms) == 3s );
+static_assert( std::chrono::ceil<fp_seconds>(500ms) == fp_seconds{0.5f} );
 
 static_assert( std::chrono::round<seconds>(1000ms) == 1s );
 static_assert( std::chrono::round<seconds>(1001ms) == 1s );
-- 
2.30.2