1 files changed, 11 insertions, 20 deletions

diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
index e1fb5af0e48..06d1d8c213b 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
@@ -16,8 +16,7 @@ MyImpl::NavDisplay_exec_impl::~NavDisplay_exec_impl ()
 // Operations from HUDisplay::NavDisplay
 
 void
-MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev
-                                            ACE_ENV_ARG_DECL)
+MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ev);
@@ -27,19 +26,16 @@ MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev
 
   // Refresh position
   HUDisplay::position_var loc =
-    this->context_->get_connection_GPSLocation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->context_->get_connection_GPSLocation ();
 
   if (CORBA::is_nil (loc.in ()))
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
     }
 
-  CORBA::Long x = loc->posx (ACE_ENV_SINGLE_ARG_PARAMETER) % 500;
-  ACE_CHECK;
+  CORBA::Long x = loc->posx () % 500;
 
-  CORBA::Long y = loc->posy (ACE_ENV_SINGLE_ARG_PARAMETER) % 300;
-  ACE_CHECK;
+  CORBA::Long y = loc->posy () % 300;
 
   ACE_DEBUG ((LM_DEBUG, "NAVDISPLAY: Current Location is: (%d, %d)\n",
               x,
@@ -50,7 +46,6 @@ MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev
 void
 MyImpl::NavDisplay_exec_impl::set_session_context (
     Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -62,20 +57,17 @@ MyImpl::NavDisplay_exec_impl::set_session_context (
     }
 
   this->context_ =
-    HUDisplay::CCM_NavDisplay_Context::_narrow (ctx
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    HUDisplay::CCM_NavDisplay_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
 MyImpl::NavDisplay_exec_impl::ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -83,7 +75,7 @@ MyImpl::NavDisplay_exec_impl::ciao_preactivate (
 }
 
 void
-MyImpl::NavDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplay_exec_impl::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -96,7 +88,6 @@ MyImpl::NavDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 MyImpl::NavDisplay_exec_impl::ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -104,7 +95,7 @@ MyImpl::NavDisplay_exec_impl::ciao_postactivate (
 }
 
 void
-MyImpl::NavDisplay_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplay_exec_impl::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -116,7 +107,7 @@ MyImpl::NavDisplay_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::NavDisplay_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplay_exec_impl::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -142,7 +133,7 @@ MyImpl::NavDisplayHome_exec_impl::~NavDisplayHome_exec_impl ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::NavDisplayHome_exec_impl::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplayHome_exec_impl::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {