diff options
| author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 21:11:03 +0000 |
|---|---|---|
| committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 21:11:03 +0000 |
| commit | 5e030faf84086ab02059fcbcc3faed224bd57b95 (patch) | |
| tree | 3a62df45ac6ccf599fb07cf6a03d672456ce2e3d /TAO/orbsvcs/orbsvcs/FtRtEvent | |
| parent | 9d296f7fa51116ff7040ecb2ad18612cd94b5fd1 (diff) | |
| download | ATCD-5e030faf84086ab02059fcbcc3faed224bd57b95.tar.gz | |
Merge in OCI_Reliability_Enhancements branch.
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index f6592820c0f..18e2bb69a54 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -242,7 +242,7 @@ void FTEC_Gateway::remove_observer (RtecEventChannelAdmin::Observer_Handle handl void FTEC_Gateway::push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consumer, const RtecEventComm::EventSet & data) { - PortableServer::ObjectId_var object_id = + const PortableServer::ObjectId_var object_id = impl_->poa->reference_to_id(proxy_consumer); FtRtecEventComm::ObjectId** result; ACE_OS::memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**)); @@ -315,9 +315,9 @@ get_remote_oid_ptr(CORBA::ORB_ptr orb) { PortableServer::Current_var current = resolve_init<PortableServer::Current>(orb, - "POACurrent"); + "POACurrent"); - PortableServer::ObjectId_var object_id = + const PortableServer::ObjectId_var object_id = current->get_object_id(); FtRtecEventComm::ObjectId** result; |