summaryrefslogtreecommitdiffstats
path: root/Source/cmDuration.cxx
diff options
context:
space:
mode:
authorWouter Klouwen <wouter.klouwen@youview.com>2017-12-12 21:59:43 (GMT)
committerBrad King <brad.king@kitware.com>2018-01-23 15:05:12 (GMT)
commitff62b00522d1ddaeb88be241ab4a022f935b5c00 (patch)
tree5144559ff41c2374fd01637b0326fb18eed2c1eb /Source/cmDuration.cxx
parent695951bc46fa4bc4eaf686c4ee6dce24c579bc45 (diff)
downloadCMake-ff62b00522d1ddaeb88be241ab4a022f935b5c00.zip
CMake-ff62b00522d1ddaeb88be241ab4a022f935b5c00.tar.gz
CMake-ff62b00522d1ddaeb88be241ab4a022f935b5c00.tar.bz2
CTest: add safe conversion from cmDuration to integer types
A problem area by recent refactoring of time to std::chrono has been the unsafe conversion from duration<double> to std::chrono::seconds, which is of an unspecified integer type. This commit adds a template function that for a given type provides a safe conversion, effectively clamping a duration<double> into what fits safely in that type. A specialisation for int and unsigned int are provided. It changes the protential problem areas to use this safe function.
Diffstat (limited to 'Source/cmDuration.cxx')
-rw-r--r--Source/cmDuration.cxx27
1 files changed, 27 insertions, 0 deletions
diff --git a/Source/cmDuration.cxx b/Source/cmDuration.cxx
new file mode 100644
index 0000000..8ca5d8d
--- /dev/null
+++ b/Source/cmDuration.cxx
@@ -0,0 +1,27 @@
+/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+ file Copyright.txt or https://cmake.org/licensing for details. */
+#define CMDURATION_CPP
+#include "cmDuration.h"
+
+template <typename T>
+T cmDurationTo(const cmDuration& duration)
+{
+ /* This works because the comparison operators for duration rely on
+ * std::common_type.
+ * So for example duration<int>::max() gets promoted to a duration<double>,
+ * which can then be safely compared.
+ */
+ if (duration >= std::chrono::duration<T>::max()) {
+ return std::chrono::duration<T>::max().count();
+ }
+ if (duration <= std::chrono::duration<T>::min()) {
+ return std::chrono::duration<T>::min().count();
+ }
+ // Ensure number of seconds by defining ratio<1>
+ return std::chrono::duration_cast<std::chrono::duration<T, std::ratio<1>>>(
+ duration)
+ .count();
+}
+
+template int cmDurationTo<int>(const cmDuration&);
+template unsigned int cmDurationTo<unsigned int>(const cmDuration&);