changed hrtime_t to ACE_hrtime_t; added unsupported ()

1 files changed, 21 insertions, 15 deletions

diff --git a/ace/High_Res_Timer.i b/ace/High_Res_Timer.i
index 0a2dd694429..68b5eb3dec8 100644
--- a/ace/High_Res_Timer.i
+++ b/ace/High_Res_Timer.i
@@ -3,6 +3,12 @@
 
 // High_Res_Timer.i
 
+ACE_INLINE int
+ACE_High_Res_Timer::supported ()
+{
+  return ACE_OS::gethrtime () != -1;
+}
+
 ACE_INLINE
 ACE_High_Res_Timer::ACE_High_Res_Timer (void)
 {
@@ -10,25 +16,25 @@ ACE_High_Res_Timer::ACE_High_Res_Timer (void)
   this->reset ();
 }
 
-ACE_INLINE int
+ACE_INLINE void
 ACE_High_Res_Timer::start (void)
 {
   ACE_TRACE ("ACE_High_Res_Timer::start");
-  return (int) (this->start_ = ACE_OS::gethrtime ());
+  this->start_ = ACE_OS::gethrtime ();
 }
 
-ACE_INLINE int
+ACE_INLINE void
 ACE_High_Res_Timer::stop (void)
 {
   ACE_TRACE ("ACE_High_Res_Timer::stop");
-  return (int) (this->end_ = ACE_OS::gethrtime ());
+  this->end_ = ACE_OS::gethrtime ();
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_High_Res_Timer::elapsed_time (ACE_Time_Value &tv)
 {
-  tv.sec ((this->end_ - this->start_) / 1000000L);
-  tv.usec ((this->end_ - this->start_) % 1000000L);
+  tv.sec (this->end_ - this->start_ / 1000000L);
+  tv.usec (this->end_ - this->start_ % 1000000L);
 }
 
 #if defined (ACE_HAS_POSIX_TIME)
@@ -40,29 +46,29 @@ ACE_High_Res_Timer::elapsed_time (timespec_t &elapsed_time)
 }
 #endif /* ACE_HAS_POSIX_TIME */
 
-ACE_INLINE int 
+ACE_INLINE void
 ACE_High_Res_Timer::start_incr (void)
 {
   ACE_TRACE ("ACE_High_Res_Timer::start_incr");
-  return (int) (this->start_incr_ = ACE_OS::gethrtime ());
+  this->start_incr_ = ACE_OS::gethrtime ();
 }
 
-ACE_INLINE int 
+ACE_INLINE void
 ACE_High_Res_Timer::stop_incr (void)
 {
   ACE_TRACE ("ACE_High_Res_Timer::stop_incr");
-  return (int) (this->total_ += (ACE_OS::gethrtime () - this->start_incr_));
+  this->total_ += ACE_OS::gethrtime () - this->start_incr_;
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_High_Res_Timer::elapsed_time_incr (ACE_Time_Value &tv)
 {
-  tv.sec ((this->total_) / 1000000L);
-  tv.usec ((this->total_) % 1000000L);
+  tv.sec (this->total_ / 1000000L);
+  tv.usec (this->total_ % 1000000L);
 }
 
 ACE_INLINE void
-ACE_High_Res_Timer::elapsed_microseconds (hrtime_t &usecs) const
+ACE_High_Res_Timer::elapsed_microseconds (ACE_hrtime_t &usecs) const
 {
   usecs = (this->end_ - this->start_) / 1000;
 }