diff options
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index 9242d81009d..6960b5e875b 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -127,7 +127,8 @@ TAO_Time_Service_Clerk::get_time (void) // elapsed since last updation was done. CORBA::ULongLong time; - time = (CORBA::ULongLong) (ACE_OS::gettimeofday ().sec () * 10000000 + time = (CORBA::ULongLong) (ACE_OS::gettimeofday ().sec () * + ACE_static_cast (CORBA::ULongLong, 10000000) + ACE_OS::gettimeofday ().usec () * 10) - this->update_timestamp_ + this->time_; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index ef145723be2..31a0c141248 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -26,7 +26,8 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV) // Return the local time of the system as a UTO. ACE_NEW_THROW_EX (uto, - TAO_UTO (CORBA::ULongLong (ACE_OS::gettimeofday ().sec () * 10000000 + TAO_UTO (CORBA::ULongLong (ACE_OS::gettimeofday ().sec () * + ACE_static_cast(CORBA::ULongLong, 10000000) + ACE_OS::gettimeofday ().usec () * 10), 0, 0), diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 2da2b708e98..1d0bcfc4268 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -124,9 +124,10 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, // Record the current time in a timestamp to know when global // updation of time was done. - clerk_->update_timestamp_ = ACE_OS::gettimeofday ().sec () * 10000000 + clerk_->update_timestamp_ = ACE_OS::gettimeofday ().sec () * + ACE_static_cast (CORBA::ULongLong, 10000000) + ACE_OS::gettimeofday ().usec () * 10; - + } ACE_CATCHANY { |