diff options
| author | Jose <jose@zeroc.com> | 2019-06-21 22:22:14 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-21 22:22:14 +0200 |
| commit | d1b7c66fab777fe72e5cf77fd284218e2080b017 (patch) | |
| tree | b48615b2d9d2f59195c8a560e07585b9cbb77cb5 /cpp/src/IceUtil/Time.cpp | |
| parent | Add ice_isFixed - Close #356 (diff) | |
| download | ice-d1b7c66fab777fe72e5cf77fd284218e2080b017.tar.bz2 ice-d1b7c66fab777fe72e5cf77fd284218e2080b017.tar.xz ice-d1b7c66fab777fe72e5cf77fd284218e2080b017.zip | |
Enable -Wconversion with clang - Close #363
Diffstat (limited to 'cpp/src/IceUtil/Time.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Time.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp index 4c4dc4b68a4..b53e6757118 100644 --- a/cpp/src/IceUtil/Time.cpp +++ b/cpp/src/IceUtil/Time.cpp @@ -144,7 +144,7 @@ IceUtil::Time::now(Clock clock) } return Time(tv.tv_sec * ICE_INT64(1000000) + tv.tv_usec); #elif defined(__APPLE__) - return Time(mach_absolute_time() * machMultiplier); + return Time(static_cast<IceUtil::Int64>(mach_absolute_time() * machMultiplier)); #else struct timespec ts; if(clock_gettime(CLOCK_MONOTONIC, &ts) < 0) @@ -197,8 +197,8 @@ IceUtil::Time::microSecondsDouble(double t) IceUtil::Time::operator timeval() const { timeval tv; - tv.tv_sec = static_cast<long>(_usec / 1000000); - tv.tv_usec = static_cast<long>(_usec % 1000000); + tv.tv_sec = static_cast<time_t>(_usec / 1000000); + tv.tv_usec = static_cast<suseconds_t>(_usec % 1000000); return tv; } #endif |