diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-27 11:03:33 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-27 11:03:33 +0000 |
| commit | 54eb2811dc6593e84c67e8ebc2b31b1fd2cbca42 (patch) | |
| tree | 3d00eb41dee7d4ad797e572c9ab2a3e10b13ea64 /ACE/ace/Time_Value.inl | |
| parent | 3f3114f7fa72d9cbece012ce62ba41f08e99e03c (diff) | |
| download | ATCD-54eb2811dc6593e84c67e8ebc2b31b1fd2cbca42.tar.gz | |
Wed Apr 27 11:02:59 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Time_Value.inl:
* ace/Time_Value.cpp:
Corrected some casts to use time_t
Diffstat (limited to 'ACE/ace/Time_Value.inl')
| -rw-r--r-- | ACE/ace/Time_Value.inl | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index ce556dbb853..a1cde15dcf3 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -58,19 +58,7 @@ ACE_INLINE void ACE_Time_Value::set (time_t sec, suseconds_t usec) { // ACE_OS_TRACE ("ACE_Time_Value::set"); -# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) && defined (_MSC_VER) - // The WinCE 6.0 SDK ships with a timeval tv_sec member that uses long as type - // not time_t. This resolves in compilation warnings because time_t - // can be 64bit. Disable at this moment the warning for just this method - // else we get a compile warnings each time this inline file is included - // this file. -# pragma warning (push) -# pragma warning (disable: 4244) -# endif this->tv_.tv_sec = sec; -# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) && defined (_MSC_VER) -# pragma warning (pop) -# endif this->tv_.tv_usec = usec; #if __GNUC__ if (__builtin_constant_p(sec) && @@ -85,7 +73,7 @@ ACE_INLINE void ACE_Time_Value::set (double d) { // ACE_OS_TRACE ("ACE_Time_Value::set"); - long l = (long) d; + time_t l = (time_t) d; this->tv_.tv_sec = l; this->tv_.tv_usec = (suseconds_t) ((d - (double) l) * ACE_ONE_SECOND_IN_USECS + .5); this->normalize (); |