diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-26 15:55:55 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-26 15:55:55 +0000 |
| commit | 506adb8d38a14c6fce1803bcd75f61a02c4b8509 (patch) | |
| tree | 873c55e753dde9a129eea9d77e2dc2d998340a2f | |
| parent | caea12926e24990a0092409eb4333cc9e2cfcab2 (diff) | |
| download | ATCD-506adb8d38a14c6fce1803bcd75f61a02c4b8509.tar.gz | |
ChangeLogTag:Mon Apr 26 10:54:23 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 10 | ||||
| -rw-r--r-- | ace/High_Res_Timer.h | 6 | ||||
| -rw-r--r-- | ace/Synch_T.cpp | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 5ba8ede6f82..baa40bf694a 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,13 @@ +Mon Apr 26 10:54:23 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/High_Res_Timer.h: + Moved the static method hrtime_to_tv to the public section. It + is useful outside this class. + + * ace/Synch_T.cpp: + The default constructor for ACE_Reverse_Lock should not allocate + the locking mechanism, otherwise it cannot work with ACE_Lock. + Mon Apr 26 07:30:51 1999 Nanbor Wang <nanbor@cs.wustl.edu> * ace/OS.i (fstat): Changed to use CE's implementation and added diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h index cce0a843b5d..676e47f24cb 100644 --- a/ace/High_Res_Timer.h +++ b/ace/High_Res_Timer.h @@ -178,11 +178,11 @@ public: // However, setting the global_scale_factor_ appropriately will // result in the finest resolution possible. -private: static void hrtime_to_tv (ACE_Time_Value &tv, const ACE_hrtime_t hrt); // Converts an <hrt> to <tv> using global_scale_factor_. +private: static ACE_hrtime_t gettime (const ACE_OS::ACE_HRTimer_Op = ACE_OS::ACE_HRTIMER_GETTIME); // For internal use: gets the high-resolution time using @@ -208,9 +208,9 @@ private: // global_scale_factor_ == microseconds. static int global_scale_factor_status_; - // Indicates the status of the global scale factor, + // Indicates the status of the global scale factor, // 0 = hasn't been set - // 1 = been set + // 1 = been set // -1 = HR timer not supported }; diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp index f8b3e41cb72..27936891d09 100644 --- a/ace/Synch_T.cpp +++ b/ace/Synch_T.cpp @@ -42,7 +42,7 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (void) : lock_ (0), delete_lock_ (1) { - ACE_NEW (this->lock_, ACE_LOCKING_MECHANISM); + // ACE_NEW (this->lock_, ACE_LOCKING_MECHANISM); } template <class ACE_LOCK, class TYPE> |