diff options
Diffstat (limited to 'orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp')
-rw-r--r-- | orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index 50216f31ff9..ed54c02d3d9 100644 --- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -150,7 +150,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) RtecUDPAdmin::AddrServer::_narrow(tmpobj.in()); // Create and initialize the sender object - TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = + PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create(); TAO_ECG_UDP_Out_Endpoint endpoint; // need to be explicit about the address type when built with @@ -179,7 +179,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) sender->connect (sub); // Create and initialize the receiver - TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver = + PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver = TAO_ECG_UDP_Receiver::create(); // TAO_ECG_UDP_Receiver::init() takes a TAO_ECG_Refcounted_Endpoint. @@ -200,7 +200,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) auto_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in())); mcast_eh->reactor (orb->orb_core ()->reactor ()); mcast_eh->open (ec.in()); - ACE_AUTO_PTR_RESET(eh,mcast_eh.release(),ACE_Event_Handler); + ACE_auto_ptr_reset(eh,mcast_eh.release()); //eh.reset(mcast_eh.release()); } else { auto_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in())); @@ -209,7 +209,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (udp_eh->open (local_addr) == -1) ACE_ERROR ((LM_ERROR,"Cannot open EH\n")); - ACE_AUTO_PTR_RESET(eh,udp_eh.release(),ACE_Event_Handler); + ACE_auto_ptr_reset(eh,udp_eh.release()); //eh.reset(udp_eh.release()); } |