diff options
| author | Alan Conway <aconway@apache.org> | 2013-04-26 17:02:58 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2013-04-26 17:02:58 +0000 |
| commit | 60c147b7287000f22104d1fa3f6e2fe41d104378 (patch) | |
| tree | c3483768fc94f69561f45af1ac25dfc1cff4e405 /cpp/src | |
| parent | 76f2f302aadef0bd5892f65418f760c174b7b6ba (diff) | |
| download | qpid-python-60c147b7287000f22104d1fa3f6e2fe41d104378.tar.gz | |
QPID-4748: Fix compilation warnings introduced by r1469661.
Added explicit conversion from double to int64_t.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1476295 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/tests/TimerTest.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/tests/TimerTest.cpp b/cpp/src/tests/TimerTest.cpp index 4a1a050390..e9ca3fcdf6 100644 --- a/cpp/src/tests/TimerTest.cpp +++ b/cpp/src/tests/TimerTest.cpp @@ -133,17 +133,17 @@ Duration fromString(const std::string& str) { return boost::lexical_cast<Duratio QPID_AUTO_TEST_CASE(testOstreamInOut) { std::string empty; - BOOST_CHECK_EQUAL(toString(Duration(TIME_SEC)), "1s"); - BOOST_CHECK_EQUAL(toString(Duration(TIME_SEC*123.4)), "123.4s"); - BOOST_CHECK_EQUAL(toString(Duration(TIME_MSEC*123.4)), "123.4ms"); - BOOST_CHECK_EQUAL(toString(Duration(TIME_USEC*123.4)), "123.4us"); - BOOST_CHECK_EQUAL(toString(Duration(TIME_NSEC*123)), "123ns"); - - BOOST_CHECK_EQUAL(fromString("123.4"), Duration(TIME_SEC*123.4)); - BOOST_CHECK_EQUAL(fromString("123.4s"), Duration(TIME_SEC*123.4)); - BOOST_CHECK_EQUAL(fromString("123ms"), Duration(TIME_MSEC*123)); - BOOST_CHECK_EQUAL(fromString("123us"), Duration(TIME_USEC*123)); - BOOST_CHECK_EQUAL(fromString("123ns"), Duration(TIME_NSEC*123)); + BOOST_CHECK_EQUAL(toString(Duration(int64_t(TIME_SEC))), "1s"); + BOOST_CHECK_EQUAL(toString(Duration(int64_t(TIME_SEC*123.4))), "123.4s"); + BOOST_CHECK_EQUAL(toString(Duration(int64_t(TIME_MSEC*123.4))), "123.4ms"); + BOOST_CHECK_EQUAL(toString(Duration(int64_t(TIME_USEC*123.4))), "123.4us"); + BOOST_CHECK_EQUAL(toString(Duration(int64_t(TIME_NSEC*123))), "123ns"); + + BOOST_CHECK_EQUAL(fromString("123.4"), Duration(int64_t(TIME_SEC*123.4))); + BOOST_CHECK_EQUAL(fromString("123.4s"), Duration(int64_t(TIME_SEC*123.4))); + BOOST_CHECK_EQUAL(fromString("123ms"), Duration(int64_t(TIME_MSEC*123))); + BOOST_CHECK_EQUAL(fromString("123us"), Duration(int64_t(TIME_USEC*123))); + BOOST_CHECK_EQUAL(fromString("123ns"), Duration(int64_t(TIME_NSEC*123))); Duration d = 0; std::istringstream i; @@ -168,7 +168,7 @@ QPID_AUTO_TEST_CASE(testOptionParse) { opts.addOptions()("interval", optValue(interval, "I"), "blah"); const char *args[] = { "fakeexe", "--interval", "123.4" }; opts.parse(sizeof(args)/sizeof(args[0]), args); - BOOST_CHECK_EQUAL(interval, Duration(TIME_SEC * 123.4)); + BOOST_CHECK_EQUAL(interval, Duration(int64_t(TIME_SEC*123.4))); } QPID_AUTO_TEST_SUITE_END() |