diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2017-01-13 09:35:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 09:35:32 +0100 |
| commit | 1c63802cec8e2f909c1a09373eb48b05afd1444d (patch) | |
| tree | 7e92f6e324f9f83b4b0d9430ce0d0255a223b939 | |
| parent | 1abefe413f5d2964d0b53ae69d0de9a35d172e91 (diff) | |
| parent | 97ad74101a0ae4d0724e5c783cf740469454ee25 (diff) | |
| download | ATCD-1c63802cec8e2f909c1a09373eb48b05afd1444d.tar.gz | |
Merge pull request #355 from jwillemsen/jwi-deprecatedanyop
Make usage of var/ptr as it was
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 0050cad81b5..66f7793c896 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -266,9 +266,9 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer ( FtRtecEventChannelAdmin::ObjectId* retval = 0; ACE_NEW_THROW_EX(retval, FtRtecEventChannelAdmin::ObjectId, CORBA::NO_MEMORY()); - FtRtecEventChannelAdmin::ObjectId_var object_id = *retval; + FtRtecEventChannelAdmin::ObjectId_var object_id = retval; - Request_Context_Repository().generate_object_id(object_id.inout ()); + Request_Context_Repository().generate_object_id(*retval); obtain_push_supplier_and_connect(this, object_id.in(), @@ -300,9 +300,9 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier ( FtRtecEventChannelAdmin::ObjectId* retval = 0; ACE_NEW_THROW_EX(retval, FtRtecEventChannelAdmin::ObjectId, CORBA::NO_MEMORY()); - FtRtecEventChannelAdmin::ObjectId_var object_id = *retval; + FtRtecEventChannelAdmin::ObjectId_var object_id = retval; - Request_Context_Repository().generate_object_id(object_id.inout ()); + Request_Context_Repository().generate_object_id(*retval); obtain_push_consumer_and_connect(this, object_id.in(), |