1 files changed, 16 insertions, 21 deletions

diff --git a/CIAO/examples/Display/GPS/GPS_exec.cpp b/CIAO/examples/Display/GPS/GPS_exec.cpp
index e19fb3aa7a6..f86e6226bad 100644
--- a/CIAO/examples/Display/GPS/GPS_exec.cpp
+++ b/CIAO/examples/Display/GPS/GPS_exec.cpp
@@ -9,14 +9,14 @@
 
 // Operations from HUDisplay::position
 CORBA::Long
-MyImpl::Position_Impl::posx (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::Position_Impl::posx ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return component_.posx();
 }
 
 CORBA::Long
-MyImpl::Position_Impl::posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::Position_Impl::posy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return component_.posy();
@@ -38,7 +38,7 @@ MyImpl::GPS_exec_i::~GPS_exec_i ()
 
 // Operations from HUDisplay::GPS
   HUDisplay::CCM_position_ptr
-  MyImpl::GPS_exec_i::get_MyLocation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  MyImpl::GPS_exec_i::get_MyLocation ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
 //     ACE_DEBUG ((LM_DEBUG,
@@ -47,8 +47,7 @@ MyImpl::GPS_exec_i::~GPS_exec_i ()
   }
 
 void
-MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *
-                                  ACE_ENV_ARG_DECL)
+MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 //   ACE_DEBUG ((LM_DEBUG,
@@ -61,19 +60,18 @@ MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *
   // Nitify others
   HUDisplay::tick_var event = new OBV_HUDisplay::tick;
 
-  this->context_->push_Ready (event
-                              ACE_ENV_ARG_PARAMETER);
+  this->context_->push_Ready (event);
 }
 
 CORBA::Long
-MyImpl::GPS_exec_i::posx (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::posx ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positionx_;
 }
 
 CORBA::Long
-MyImpl::GPS_exec_i::posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::posy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positiony_;
@@ -82,8 +80,7 @@ MyImpl::GPS_exec_i::posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Operations from Components::SessionComponent
 void
-MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx
-                                         ACE_ENV_ARG_DECL)
+MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -91,24 +88,22 @@ MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx
     ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::set_session_context\n"));
 
   this->context_ =
-    HUDisplay::CCM_GPS_Context::_narrow (ctx
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    HUDisplay::CCM_GPS_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::GPS_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::GPS_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -117,14 +112,14 @@ MyImpl::GPS_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::GPS_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::GPS_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -133,7 +128,7 @@ MyImpl::GPS_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::GPS_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -156,7 +151,7 @@ MyImpl::GPSHome_exec_i::~GPSHome_exec_i ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::GPSHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPSHome_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {