diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-08-16 12:45:46 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-08-16 12:45:46 +0000 |
| commit | 4fec579b8f05ddce263d9b8998c6a6e10e971a08 (patch) | |
| tree | 820d4afc0efefc573314e7c979f529225ab51a54 /ACE | |
| parent | 2ef7779703acc5a0905040602d27c5cbf2ddeb13 (diff) | |
| download | ATCD-4fec579b8f05ddce263d9b8998c6a6e10e971a08.tar.gz | |
Thu Aug 16 12:44:05 UTC 2012 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/Task_T.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/Time_Policy_T.inl | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 2a656c72a0d..004dd6dd8b5 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Thu Aug 16 12:44:05 UTC 2012 Martin Corino <mcorino@remedy.nl> + + * ace/Task_T.inl: + * ace/Time_Policy_T.inl: + Fuzz fixes. + +======= Thu Aug 16 09:43:00 UTC 2012 Simon Massey <sma at prismtech dot com> * test/Bug_3943_Regression_Test.cpp: diff --git a/ACE/ace/Task_T.inl b/ACE/ace/Task_T.inl index c9b076f497c..7b20baea3ae 100644 --- a/ACE/ace/Task_T.inl +++ b/ACE/ace/Task_T.inl @@ -66,12 +66,12 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Time_Value_T<TIME_POLICY> +ACE_Time_Value_T<TIME_POLICY> ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::gettimeofday (void) const { if (this->msg_queue_ != 0) return this->msg_queue_->gettimeofday (); - + return ACE_Time_Value_T<TIME_POLICY> (ACE_Time_Value::zero); } diff --git a/ACE/ace/Time_Policy_T.inl b/ACE/ace/Time_Policy_T.inl index c33b102c7e6..3aec79fe737 100644 --- a/ACE/ace/Time_Policy_T.inl +++ b/ACE/ace/Time_Policy_T.inl @@ -4,14 +4,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template <typename TIME_POLICY> +template <typename TIME_POLICY> ACE_INLINE ACE_Time_Policy_T<TIME_POLICY>::ACE_Time_Policy_T (TIME_POLICY const & time_policy) : time_policy_ (time_policy) { } -template <typename TIME_POLICY> +template <typename TIME_POLICY> ACE_INLINE ACE_Time_Value_T<ACE_Delegating_Time_Policy> ACE_Time_Policy_T<TIME_POLICY>::operator() () const { |