diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-06-15 18:08:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-15 18:08:24 +0200 |
commit | 9bfd3221d90cd917b7dea4c23761a00c71c3b052 (patch) | |
tree | 235173840c8d1cd82f6be617af47a8f1a8efbd32 | |
parent | da62ecad417a518c4540e6a488dacc55511f670c (diff) | |
parent | 0bbb85f28b5f78a978767cc115e4f94cebd90e2a (diff) | |
download | ATCD-9bfd3221d90cd917b7dea4c23761a00c71c3b052.tar.gz |
Merge pull request #1143 from jwillemsen/jwi-inputcdrassignment
With C++11 define a default assignment operator to get rid of C++11 w…
-rw-r--r-- | TAO/tao/CDR.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 87a5462f93e..a0ea7524462 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -404,10 +404,14 @@ public: TAO_ORB_Core* orb_core = 0); /// Initialize the contents of one CDR from another, without data - /// copying and with minimimum locking overhead. + /// copying and with minimum locking overhead. TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs, TAO_ORB_Core* orb_core = 0); +#if defined (ACE_HAS_CPP11) + TAO_InputCDR& operator= (const TAO_InputCDR& rhs) = default; +#endif /* ACE_HAS_CPP11 */ + /// Destructor virtual ~TAO_InputCDR (void); |