diff options
| -rw-r--r-- | TAO/ChangeLog-99c | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp | 9 |
4 files changed, 29 insertions, 10 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 494e9d25093..33cfd737edd 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,4 +1,12 @@ Mon May 31 15:55:07 1999 Vishal Kachroo <vishal@cs.wustl.edu> + Fixed a warning on VxWorks. Replaces long int * ACE_UINT64 + with ACE_UINT64 * ACE_UINT64. Changed the following files : + + *orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp: + *orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp: + *orbsvcs/orbsvcs/Time/Timer_Helper.cpp: + +Mon May 31 15:55:07 1999 Vishal Kachroo <vishal@cs.wustl.edu> Converted the INS test to a stand-alone. It was previously working in conjunction with the bank server.The test can be used diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index 6960b5e875b..572f962aecf 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -127,10 +127,14 @@ TAO_Time_Service_Clerk::get_time (void) // elapsed since last updation was done. CORBA::ULongLong time; - time = (CORBA::ULongLong) (ACE_OS::gettimeofday ().sec () * - ACE_static_cast (CORBA::ULongLong, 10000000) - + ACE_OS::gettimeofday ().usec () * 10) - - this->update_timestamp_ + this->time_; + time = (CORBA::ULongLong) (ACE_static_cast (CORBA::ULongLong, + ACE_OS::gettimeofday ().sec ()) * + ACE_static_cast (CORBA::ULongLong, + 10000000) + + ACE_static_cast (CORBA::ULongLong, + ACE_OS::gettimeofday ().usec () * 10)) + - this->update_timestamp_ + + this->time_; return time; } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index 31a0c141248..41892d1b4b3 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -26,12 +26,16 @@ 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 () * - ACE_static_cast(CORBA::ULongLong, 10000000) - + ACE_OS::gettimeofday ().usec () * 10), + TAO_UTO (ACE_static_cast(CORBA::ULongLong, + ACE_OS::gettimeofday ().sec ()) * + ACE_static_cast(CORBA::ULongLong, + 10000000) + + ACE_static_cast(CORBA::ULongLong, + ACE_OS::gettimeofday ().usec () * 10), 0, 0), CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (CosTime::UTO::_nil ()); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 1d0bcfc4268..08e9c74a181 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -124,9 +124,12 @@ 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 () * - ACE_static_cast (CORBA::ULongLong, 10000000) - + ACE_OS::gettimeofday ().usec () * 10; + clerk_->update_timestamp_ = ACE_static_cast (CORBA::ULongLong, + ACE_OS::gettimeofday ().sec ()) * + ACE_static_cast (CORBA::ULongLong, + 10000000) + + ACE_static_cast (CORBA::ULongLong, + ACE_OS::gettimeofday ().usec () * 10); } ACE_CATCHANY |