diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-23 09:14:55 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-23 09:14:55 +0000 |
| commit | d4733867c967311244de9ee3bc315a78b75494f2 (patch) | |
| tree | 178bf2f18ded91770592a5127cba3becff6a4719 | |
| parent | 063df11af7574e6c427fcef56cd894b8d21d5415 (diff) | |
| download | ATCD-d4733867c967311244de9ee3bc315a78b75494f2.tar.gz | |
Thu Oct 23 09:14:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c65a3f9aeee..848776bfaac 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 23 09:14:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp: + Fixed compile error + Thu Oct 23 07:54:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * DevGuideExamples/EventServices diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index d6f3314dc7e..a1c76e382a6 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -152,10 +152,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // TAO_ECG_UDP_Sender::init() takes a TAO_ECG_Refcounted_Endpoint. // If we don't clone our endpoint and pass &endpoint, the sender will // attempt to delete endpoint during shutdown. - TAO_ECG_UDP_Out_Endpoint* clone; - ACE_NEW_RETURN (clone, - TAO_ECG_UDP_Out_Endpoint (endpoint), - -1); + TAO_ECG_Refcounted_Endpoint clone (new TAO_ECG_UDP_Out_Endpoint (endpoint)); sender->init (ec.in (), addr_srv.in (), clone); // Setup the subscription and connect to the EC @@ -172,10 +169,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // TAO_ECG_UDP_Receiver::init() takes a TAO_ECG_Refcounted_Endpoint. // If we don't clone our endpoint and pass &endpoint, the receiver will // attempt to delete endpoint during shutdown. - ACE_NEW_RETURN (clone, - TAO_ECG_UDP_Out_Endpoint (endpoint), - -1); - receiver->init (ec.in (), clone, addr_srv.in ()); + TAO_ECG_Refcounted_Endpoint clone2 (new TAO_ECG_UDP_Out_Endpoint (endpoint)); + receiver->init (ec.in (), clone2, addr_srv.in ()); // Setup the registration and connect to the event channel ACE_SupplierQOS_Factory supp_qos_fact; |