diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-03-07 13:30:50 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-03-07 13:30:50 +0000 |
| commit | 7af69a0ad4d6e28b1747ceadb2d1a9811960eb8d (patch) | |
| tree | c908869a4176e9671a3855030936e7eeae7a5ee6 | |
| parent | 20936f7a38ec18e6249116d428beb0692770499f (diff) | |
| download | ATCD-7af69a0ad4d6e28b1747ceadb2d1a9811960eb8d.tar.gz | |
Fri Mar 7 13:31:56 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Transport.h:
Use ACE_UNIMPLEMENTED_FUNC instead of ACE_Copy_Disabled,
the first maps to =delete with C++11 and results in a small
footprint decrease
* tao/TransportCurrent/TC.idl:
Doxygen improvements
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/Transport.h | 6 | ||||
| -rw-r--r-- | TAO/tao/TransportCurrent/TC.idl | 6 |
3 files changed, 16 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0928a0c5f70..57a140ae2b1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Mar 7 13:31:56 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Transport.h: + Use ACE_UNIMPLEMENTED_FUNC instead of ACE_Copy_Disabled, + the first maps to =delete with C++11 and results in a small + footprint decrease + + * tao/TransportCurrent/TC.idl: + Doxygen improvements + Fri Feb 28 07:59:54 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index ee09b443200..87500324814 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -30,7 +30,6 @@ #include "tao/Message_Semantics.h" #include "ace/Time_Value.h" #include "ace/Basic_Stats.h" -#include "ace/Copy_Disabled.h" struct iovec; @@ -319,7 +318,7 @@ namespace TAO * https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/TAO/docs/pluggable_protocols/index.html?revision=HEAD * */ -class TAO_Export TAO_Transport : private ACE_Copy_Disabled +class TAO_Export TAO_Transport { public: @@ -1057,6 +1056,9 @@ protected: int notify_reactor_now (void); private: + ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport &)) + ACE_UNIMPLEMENTED_FUNC (TAO_Transport &operator= (const TAO_Transport &)) + /// Assume the lock is held void send_connection_closed_notifications_i (void); diff --git a/TAO/tao/TransportCurrent/TC.idl b/TAO/tao/TransportCurrent/TC.idl index 152da12caa6..ac0803ebd04 100644 --- a/TAO/tao/TransportCurrent/TC.idl +++ b/TAO/tao/TransportCurrent/TC.idl @@ -25,14 +25,12 @@ module TAO /// context. Also, this exception is thrown if no Transport has /// been selected for the current thread, for example in a /// collocated invocation. - exception NoContext { }; - // The primary interface, providing access to Transport - // information, available to the current thread. - + /// The primary interface, providing access to Transport + /// information, available to the current thread. local interface Current { /// Transport ID, unique within the process. |