diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-05-01 09:28:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-01 09:28:44 +0200 |
| commit | ddd9845488c8120ab6f41a1a7ac754c9a91af2a8 (patch) | |
| tree | 0951b41cf07d8522ac1629e6e1caf63796d7de10 | |
| parent | 2a3decc2f97f73ee240df4c6c0e63fcb8c0ce179 (diff) | |
| parent | 3c8f6b20d4278c244df52246bf3c0a98db16f060 (diff) | |
| download | ATCD-ddd9845488c8120ab6f41a1a7ac754c9a91af2a8.tar.gz | |
Merge pull request #898 from jwillemsen/jwi-timevalue
Removed our version of ACE_Time_Value::operator=, the compiler genera…
| -rw-r--r-- | ACE/ace/Time_Value.h | 8 | ||||
| -rw-r--r-- | ACE/ace/Time_Value.inl | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h index 7b67867ee23..3e51853ecba 100644 --- a/ACE/ace/Time_Value.h +++ b/ACE/ace/Time_Value.h @@ -84,6 +84,9 @@ public: explicit ACE_Time_Value (const timespec_t &t); #if defined (ACE_HAS_CPP11) + ACE_Time_Value (const ACE_Time_Value&) = default; + ACE_Time_Value (ACE_Time_Value&&) = default; + /// Construct the ACE_Time_Value object from a chrono duration. template< class Rep, class Period > explicit ACE_Time_Value (const std::chrono::duration<Rep, Period>& duration) @@ -264,8 +267,11 @@ public: /// Add @a tv to this. ACE_Time_Value &operator += (time_t tv); +#if defined (ACE_HAS_CPP11) /// Assign @a tv to this - ACE_Time_Value &operator = (const ACE_Time_Value &tv); + ACE_Time_Value &operator = (const ACE_Time_Value &) = default; + ACE_Time_Value &operator = (ACE_Time_Value &&) = default; +#endif /* ACE_HAS_CPP11 */ /// Assign @a tv to this ACE_Time_Value &operator = (time_t tv); diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index 98459b47713..581e348657b 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -344,15 +344,6 @@ ACE_Time_Value::operator+= (time_t tv) } ACE_INLINE ACE_Time_Value & -ACE_Time_Value::operator= (const ACE_Time_Value &tv) -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator="); - this->sec (tv.sec ()); - this->usec (tv.usec ()); - return *this; -} - -ACE_INLINE ACE_Time_Value & ACE_Time_Value::operator= (time_t tv) { // ACE_OS_TRACE ("ACE_Time_Value::operator="); |