diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-29 19:31:42 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-29 19:31:42 +0000 |
| commit | 2f68a8877ae8177ae52d304d52602475723f9eb0 (patch) | |
| tree | de27699e67e7e46e714c68be3e9e1c7569f9a840 | |
| parent | ff969f9dd2115db477832eb4d0aaa124af1ca0d8 (diff) | |
| download | ATCD-2f68a8877ae8177ae52d304d52602475723f9eb0.tar.gz | |
Tue Nov 29 19:28:56 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Countdown_Time.h:
* ace/Countdown_Time.cpp:
Use default value for constructor reducing the number of constructors
| -rw-r--r-- | ACE/ChangeLog | 12 | ||||
| -rw-r--r-- | ACE/ace/Countdown_Time.cpp | 8 | ||||
| -rw-r--r-- | ACE/ace/Countdown_Time.h | 7 |
3 files changed, 11 insertions, 16 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f6202e9be62..bfb39998bf7 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,15 +1,21 @@ +Tue Nov 29 19:28:56 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Countdown_Time.h: + * ace/Countdown_Time.cpp: + Use default value for constructor reducing the number of constructors + Tue Nov 29 15:50:06 UTC 2011 Martin Corino <mcorino@remedy.nl> * ace/Timer_Queue_T.h: * ace/Timer_Queue_T.inl: - + Added get_timer_method() to be able reuse timer method setting. - + * ace/Countdown_Time.h: * ace/Countdown_Time.inl: * ace/Countdown_Time.cpp: - + Added option to use application defined timer like timer queue. diff --git a/ACE/ace/Countdown_Time.cpp b/ACE/ace/Countdown_Time.cpp index 0c7aef27029..dded80fc592 100644 --- a/ACE/ace/Countdown_Time.cpp +++ b/ACE/ace/Countdown_Time.cpp @@ -8,14 +8,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time) - : max_wait_time_ (max_wait_time), - stopped_ (false), - gettimeofday_ (0) -{ - this->start (); -} - ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time, ACE_Time_Value (*gettimeofday)(void)) : max_wait_time_ (max_wait_time), diff --git a/ACE/ace/Countdown_Time.h b/ACE/ace/Countdown_Time.h index cf881566299..b4630e9dc22 100644 --- a/ACE/ace/Countdown_Time.h +++ b/ACE/ace/Countdown_Time.h @@ -39,13 +39,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Countdown_Time : private ACE_Copy_Disabled { public: - /// Cache the @a max_wait_time and call @c start(). - ACE_Countdown_Time (ACE_Time_Value *max_wait_time); - /// Cache the @a max_wait_time and call @c start(), use /// application supplied gettimeofday function. - ACE_Countdown_Time (ACE_Time_Value *max_wait_time, - ACE_Time_Value (*gettimeofday)(void)); + explicit ACE_Countdown_Time (ACE_Time_Value *max_wait_time, + ACE_Time_Value (*gettimeofday)(void) = 0); /// Destructor, makes sure the max_wait_time that got passed as pointer /// to the constructor is updated with the time elapsed. |