diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-10-03 21:46:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 21:46:43 +0200 |
| commit | 299eaff04c78b97522d591be2eb7937f265f930b (patch) | |
| tree | 4bf6d07f3c45dc7f3b1beea03d0cc96a3f6d8f8c | |
| parent | 4b67e5a178658c04d86232b1bd649ecd3caf66b4 (diff) | |
| parent | 4e484bfb6c0ee71bde2313e333368a6b43fe937d (diff) | |
| download | ATCD-299eaff04c78b97522d591be2eb7937f265f930b.tar.gz | |
Merge pull request #307 from jwillemsen/master
Added case to silence win32 warning
| -rw-r--r-- | ACE/ace/Time_Value.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index 0cad794c554..e33d73ef35c 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -181,7 +181,7 @@ ACE_Time_Value::normalize (bool saturate) this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS) { time_t sec = std::abs(this->tv_.tv_usec) / ACE_ONE_SECOND_IN_USECS * (this->tv_.tv_usec > 0 ? 1 : -1); - suseconds_t usec = this->tv_.tv_usec - sec * ACE_ONE_SECOND_IN_USECS; + suseconds_t usec = static_cast<suseconds_t> (this->tv_.tv_usec - sec * ACE_ONE_SECOND_IN_USECS); if (saturate && this->tv_.tv_sec > 0 && sec > 0 && ACE_Numeric_Limits<time_t>::max() - this->tv_.tv_sec < sec) |