diff options
Diffstat (limited to 'ACE/ace/Time_Policy.h')
| -rw-r--r-- | ACE/ace/Time_Policy.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ACE/ace/Time_Policy.h b/ACE/ace/Time_Policy.h index 29ffa7d4ab6..b50d0594a4d 100644 --- a/ACE/ace/Time_Policy.h +++ b/ACE/ace/Time_Policy.h @@ -35,7 +35,7 @@ public: ACE_Time_Value_T<ACE_System_Time_Policy> operator() () const; /// Noop. Just here to satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); }; /** @@ -50,7 +50,7 @@ public: ACE_Time_Value_T<ACE_HR_Time_Policy> operator() () const; /// Noop. Just here to satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); }; /** @@ -92,7 +92,7 @@ public: ACE_Time_Value_T<ACE_FPointer_Time_Policy> operator()() const; /// Satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); private: FPtr function_; }; @@ -116,15 +116,13 @@ public: /// Set delegate void set_delegate (ACE_Dynamic_Time_Policy_Base const * delegate); -#if defined (ACE_HAS_CPP11) ACE_Delegating_Time_Policy (const ACE_Delegating_Time_Policy&) = default; ACE_Delegating_Time_Policy (ACE_Delegating_Time_Policy&&) = default; ACE_Delegating_Time_Policy& operator = (ACE_Delegating_Time_Policy const &) = default; ACE_Delegating_Time_Policy &operator = (ACE_Delegating_Time_Policy&&) = default; -#endif /* ACE_HAS_CPP11 */ /// Noop. Just here to satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); private: ACE_Dynamic_Time_Policy_Base const * delegate_; }; @@ -144,7 +142,7 @@ public: ACE_Time_Value_T<ACE_Delegating_Time_Policy> operator()() const; /// Noop. Just here to satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); protected: /// Return the current time according to policy implementation. virtual ACE_Time_Value_T<ACE_Delegating_Time_Policy> gettimeofday () const = 0; |