summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-05-01 08:25:16 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-05-01 08:25:16 +0200
commit592b0cb0adc7068bc2a415a46c7b53a7163b177a (patch)
treee373851d32c58dfad4f2076ae7853eb8ad81620c
parentec914b26bb618c14893d4302d689e3b596fcfe14 (diff)
downloadATCD-592b0cb0adc7068bc2a415a46c7b53a7163b177a.tar.gz
Fixed conversion errors by using a truncate_cast because suseconds_t is a long on windows
* ACE/tests/Chrono_Test.cpp:
-rw-r--r--ACE/tests/Chrono_Test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/tests/Chrono_Test.cpp b/ACE/tests/Chrono_Test.cpp
index 1963fce7824..7f031c1f5e7 100644
--- a/ACE/tests/Chrono_Test.cpp
+++ b/ACE/tests/Chrono_Test.cpp
@@ -206,7 +206,7 @@ test_streamers ()
std::chrono::seconds day_test_ts { day_test_h+day_test_s };
std::chrono::microseconds day_test_tus { day_test_ms+day_test_us };
ACE_Time_Value const test_day {
- ACE_Time_Value { day_test_ts.count (), day_test_tus.count () }};
+ ACE_Time_Value { day_test_ts.count (), ACE_Utils::truncate_cast<suseconds_t>(day_test_tus.count ()) }};
constexpr int expected_min {nr_hours * 60};
constexpr int64_t expected_sec { expected_min * 60 + 54 };
@@ -458,7 +458,7 @@ test_chrono_operators ()
}
std::chrono::seconds sec {1};
- ACE_Time_Value const tv_sec {1, std::mega::num};
+ ACE_Time_Value const tv_sec {1, ACE_Utils::truncate_cast<suseconds_t>(std::mega::num)};
sec += tv_sec;
if (sec.count () != 3)
{