diff options
Diffstat (limited to 'TAO/orbsvcs/examples/Notify/Federation')
4 files changed, 3 insertions, 9 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index 3e6109e1ee1..2e901202219 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -182,7 +182,7 @@ private: virtual void - disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + disconnect_structured_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // We don't care. @@ -224,7 +224,6 @@ main (int argc, char* argv[]) CORBA::Object_var obj ( orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ())); @@ -255,13 +254,11 @@ main (int argc, char* argv[]) ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create the channel factory. // EventChannelFactory_var factory (ns->create (root_poa.in () ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; if (is_nil (factory.in ())) { diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp index f34fd4bd09c..8538b217a11 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp @@ -249,7 +249,7 @@ push_structured_event (StructuredEvent const& e ACE_ENV_ARG_DECL_NOT_USED) void Gate:: -disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +disconnect_structured_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // We don't care. diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h index 312bb6b5a20..016da30f670 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h @@ -67,7 +67,7 @@ private: virtual void - disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL) + disconnect_structured_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp index 2751694dcd7..9ebf15df497 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp @@ -52,7 +52,6 @@ main (int argc, char* argv[]) CORBA::Object_var obj ( orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ())); @@ -83,13 +82,11 @@ main (int argc, char* argv[]) ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create the channel factory. // EventChannelFactory_var factory (ns->create (root_poa.in () ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; if (is_nil (factory.in ())) { |