diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-06-28 09:14:52 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-06-28 09:14:52 +0000 |
| commit | 01b8ef15ad7826f42790868d94402332596a4403 (patch) | |
| tree | 65ea28a9eb5fcb556249a5ae6702f6c469727947 /qpid/cpp/src/tests/TimerTest.cpp | |
| parent | 15874225f863757fde6c078da7079592c534b60b (diff) | |
| parent | 83c220a465faba7fa61c44dd69e7aef497083553 (diff) | |
| download | qpid-python-01b8ef15ad7826f42790868d94402332596a4403.tar.gz | |
merge non-java changes from trunk up to r1353860
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-config-and-management@1354874 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/TimerTest.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/TimerTest.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/cpp/src/tests/TimerTest.cpp b/qpid/cpp/src/tests/TimerTest.cpp index 6a0a196f4e..fc5004dcb0 100644 --- a/qpid/cpp/src/tests/TimerTest.cpp +++ b/qpid/cpp/src/tests/TimerTest.cpp @@ -81,6 +81,8 @@ class TestTask : public TimerTask uint64_t difference = _abs64(expected - actual); #elif defined(_WIN32) uint64_t difference = labs(expected - actual); +#elif defined(__SUNPRO_CC) + uint64_t difference = llabs(expected - actual); #else uint64_t difference = abs(expected - actual); #endif |