diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2010-02-22 20:01:41 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2010-02-22 20:01:41 +0000 |
| commit | 0b6a3d61027c06f2022e241a6e916baa7bc88b73 (patch) | |
| tree | b5faa45274eca38984d23db580c620c44c3bc1ae | |
| parent | 4cc1990c4f5d6d7adbde43348b81107eb3e5ebaf (diff) | |
| download | ATCD-0b6a3d61027c06f2022e241a6e916baa7bc88b73.tar.gz | |
ChangeLogTag:Mon
| -rw-r--r-- | ACE/ace/Time_Value.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index 5b5479ed919..e40f98af10e 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -255,15 +255,15 @@ ACE_Time_Value::operator *= (double d) double, long double>::result_type float_type; - float_type sec_total = this->sec(); + float_type sec_total = static_cast<float_type> (this->sec()); sec_total *= d; - + // shall we saturate the result? static const float_type max_int = ACE_Numeric_Limits<time_t>::max() + 0.999999; static const float_type min_int = ACE_Numeric_Limits<time_t>::min() - 0.999999; - + if (sec_total > max_int) this->set(ACE_Numeric_Limits<time_t>::max(), ACE_ONE_SECOND_IN_USECS-1); else if (sec_total < min_int) @@ -271,13 +271,13 @@ ACE_Time_Value::operator *= (double d) else { time_t time_sec = static_cast<time_t> (sec_total); - - float_type usec_total = this->usec(); + + float_type usec_total = this->usec(); usec_total *= d; // adding usec resulting from tv_sec mult usec_total += (sec_total-time_sec) * ACE_ONE_SECOND_IN_USECS; - + // extract seconds component of the usec mult sec_total = usec_total / ACE_ONE_SECOND_IN_USECS; // keep remaining usec @@ -285,13 +285,13 @@ ACE_Time_Value::operator *= (double d) usec_total = (sec_total - ACE_OS::floor(sec_total)); else usec_total = (sec_total - ACE_OS::ceil(sec_total)); - + sec_total -= usec_total; usec_total *= ACE_ONE_SECOND_IN_USECS; - + // add the seconds component of the usec mult with the tv_sec mult prod. sec_total += time_sec; - + // recheck for saturation if (sec_total > max_int) this->set (ACE_Numeric_Limits<time_t>::max(), ACE_ONE_SECOND_IN_USECS - 1); @@ -299,7 +299,7 @@ ACE_Time_Value::operator *= (double d) this->set (ACE_Numeric_Limits<time_t>::min(), -ACE_ONE_SECOND_IN_USECS + 1); else { - time_sec = sec_total; + time_sec = static_cast<time_t> (sec_total); suseconds_t time_usec = static_cast<suseconds_t> (usec_total); // round up the result to save the last usec |