diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-03-25 23:44:30 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-03-25 23:44:30 +0000 |
| commit | 67d330f235362bf622b95f8c4d14321272a44ba7 (patch) | |
| tree | 82153e6fd6c1c77e9defc80cb2e6b34d23de25cf /qpid/cpp/src/tests/TimerTest.cpp | |
| parent | b51fd45a4ed81bee144c22c2a57fc0e882d44149 (diff) | |
| download | qpid-python-67d330f235362bf622b95f8c4d14321272a44ba7.tar.gz | |
Merge from trunk tag to-cmake-25mar09 (r758432)
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/cmake@758465 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/TimerTest.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/TimerTest.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/cpp/src/tests/TimerTest.cpp b/qpid/cpp/src/tests/TimerTest.cpp index 50712ff79c..f8ab9fb2f3 100644 --- a/qpid/cpp/src/tests/TimerTest.cpp +++ b/qpid/cpp/src/tests/TimerTest.cpp @@ -75,7 +75,11 @@ class TestTask : public TimerTask BOOST_CHECK(fired); BOOST_CHECK_EQUAL(expected_position, position); Duration actual(start, end); +#ifdef _WIN32 + uint64_t difference = _abs64(expected - actual); +#else uint64_t difference = abs(expected - actual); +#endif std::string msg(boost::lexical_cast<std::string>(boost::format("tolerance = %1%, difference = %2%") % tolerance % difference)); BOOST_CHECK_MESSAGE(difference < tolerance, msg); } |