diff options
Diffstat (limited to 'ACE/ace/Time_Value.inl')
| -rw-r--r-- | ACE/ace/Time_Value.inl | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index 581e348657b..ad683ae365d 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -57,7 +57,7 @@ ACE_Time_Value::set (time_t sec, suseconds_t usec) // ACE_OS_TRACE ("ACE_Time_Value::set"); this->tv_.tv_sec = sec; this->tv_.tv_usec = usec; -#if __GNUC__ && !(__GNUC__ == 3 && __GNUC_MINOR__ == 4) +#ifdef __GNUC__ if ((__builtin_constant_p(sec) & __builtin_constant_p(usec)) && (sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS)) @@ -101,7 +101,7 @@ ACE_Time_Value::set (const timespec_t &tv) } ACE_INLINE -ACE_Time_Value::ACE_Time_Value (void) +ACE_Time_Value::ACE_Time_Value () // : tv_ () { // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value"); @@ -117,7 +117,7 @@ ACE_Time_Value::ACE_Time_Value (time_t sec, suseconds_t usec) /// Returns number of seconds. ACE_INLINE time_t -ACE_Time_Value::sec (void) const +ACE_Time_Value::sec () const { // ACE_OS_TRACE ("ACE_Time_Value::sec"); return this->tv_.tv_sec; @@ -133,7 +133,7 @@ ACE_Time_Value::sec (time_t sec) /// Converts from Time_Value format into milli-seconds format. ACE_INLINE unsigned long -ACE_Time_Value::msec (void) const +ACE_Time_Value::msec () const { // ACE_OS_TRACE ("ACE_Time_Value::msec"); @@ -201,7 +201,7 @@ ACE_Time_Value::msec (int milliseconds) /// Returns number of micro-seconds. ACE_INLINE suseconds_t -ACE_Time_Value::usec (void) const +ACE_Time_Value::usec () const { // ACE_OS_TRACE ("ACE_Time_Value::usec"); return this->tv_.tv_usec; @@ -397,10 +397,7 @@ operator - (const ACE_Time_Value &tv1, ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_CPP11) - // Additional chrono streaming operators. - namespace std { namespace chrono @@ -552,5 +549,3 @@ namespace std } } } - -#endif /* ACE_HAS_CPP11 */ |