summaryrefslogtreecommitdiff
path: root/CIAO/examples/Display/GPS
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/examples/Display/GPS')
-rw-r--r--CIAO/examples/Display/GPS/GPS_exec.cpp36
-rw-r--r--CIAO/examples/Display/GPS/GPS_exec.h29
-rw-r--r--CIAO/examples/Display/GPS/GPS_tracing_exec.cpp32
-rw-r--r--CIAO/examples/Display/GPS/GPS_tracing_exec.h24
4 files changed, 55 insertions, 66 deletions
diff --git a/CIAO/examples/Display/GPS/GPS_exec.cpp b/CIAO/examples/Display/GPS/GPS_exec.cpp
index 228ef1a77a2..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 (void)
+MyImpl::Position_Impl::posx ()
ACE_THROW_SPEC ((CORBA::SystemException))
{
return component_.posx();
}
CORBA::Long
-MyImpl::Position_Impl::posy (void)
+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 (void)
+ 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 (void)
+MyImpl::GPS_exec_i::posx ()
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->positionx_;
}
CORBA::Long
-MyImpl::GPS_exec_i::posy (void)
+MyImpl::GPS_exec_i::posy ()
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->positiony_;
@@ -82,8 +80,7 @@ MyImpl::GPS_exec_i::posy (void)
// 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,23 +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);
+ 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 (void)
+MyImpl::GPS_exec_i::ciao_preactivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
}
void
-MyImpl::GPS_exec_i::ccm_activate (void)
+MyImpl::GPS_exec_i::ccm_activate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
@@ -116,14 +112,14 @@ MyImpl::GPS_exec_i::ccm_activate (void)
}
void
-MyImpl::GPS_exec_i::ciao_postactivate (void)
+MyImpl::GPS_exec_i::ciao_postactivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
}
void
-MyImpl::GPS_exec_i::ccm_passivate (void)
+MyImpl::GPS_exec_i::ccm_passivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
@@ -132,7 +128,7 @@ MyImpl::GPS_exec_i::ccm_passivate (void)
}
void
-MyImpl::GPS_exec_i::ccm_remove (void)
+MyImpl::GPS_exec_i::ccm_remove ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
@@ -155,7 +151,7 @@ MyImpl::GPSHome_exec_i::~GPSHome_exec_i ()
// Implicit home operations.
::Components::EnterpriseComponent_ptr
-MyImpl::GPSHome_exec_i::create (void)
+MyImpl::GPSHome_exec_i::create ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
diff --git a/CIAO/examples/Display/GPS/GPS_exec.h b/CIAO/examples/Display/GPS/GPS_exec.h
index a6f4bac13e6..d4b8a0b777e 100644
--- a/CIAO/examples/Display/GPS/GPS_exec.h
+++ b/CIAO/examples/Display/GPS/GPS_exec.h
@@ -36,42 +36,41 @@ namespace MyImpl
~GPS_exec_i ();
// Operations from HUDisplay::GPS
- HUDisplay::CCM_position_ptr get_MyLocation (void)
+ HUDisplay::CCM_position_ptr get_MyLocation ()
ACE_THROW_SPEC ((CORBA::SystemException));
- void push_Refresh (HUDisplay::tick * ACE_ENV_ARG_DECL)
+ void push_Refresh (HUDisplay::tick *)
ACE_THROW_SPEC ((CORBA::SystemException));
// Operations from HUDisplay::position
- CORBA::Long posx (void)
+ CORBA::Long posx ()
ACE_THROW_SPEC ((CORBA::SystemException));
- CORBA::Long posy (void)
+ CORBA::Long posy ()
ACE_THROW_SPEC ((CORBA::SystemException));
// Operations from Components::SessionComponent
- void set_session_context (Components::SessionContext_ptr ctx
- ACE_ENV_ARG_DECL)
+ void set_session_context (Components::SessionContext_ptr ctx)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
- void ciao_preactivate (void)
+ void ciao_preactivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
- void ccm_activate (void)
+ void ccm_activate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
- void ciao_postactivate (void)
+ void ciao_postactivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
- void ccm_passivate (void)
+ void ccm_passivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
- void ccm_remove (void)
+ void ccm_remove ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
@@ -102,12 +101,12 @@ namespace MyImpl
// Explicit home operations
/* virtual ::Components::EnterpriseComponent_ptr */
-/* new_GPS (void) */
+/* new_GPS () */
/* ACE_THROW_SPEC ((CORBA::SystemException)); */
// Implicit home operations
virtual ::Components::EnterpriseComponent_ptr
- create (void)
+ create ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
};
@@ -123,10 +122,10 @@ namespace MyImpl
}
// Operations from HUDisplay::position
- CORBA::Long posx (void)
+ CORBA::Long posx ()
ACE_THROW_SPEC ((CORBA::SystemException));
- CORBA::Long posy (void)
+ CORBA::Long posy ()
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp b/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp
index faa5a3665d9..98b52c9ac74 100644
--- a/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp
+++ b/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp
@@ -24,15 +24,14 @@ MyImpl::GPS_tracing_exec_i::~GPS_tracing_exec_i ()
// Operations from HUDisplay::GPS
HUDisplay::CCM_position_ptr
-MyImpl::GPS_tracing_exec_i::get_MyLocation (void)
+MyImpl::GPS_tracing_exec_i::get_MyLocation ()
ACE_THROW_SPEC ((CORBA::SystemException))
{
return HUDisplay::CCM_position::_duplicate (this);
}
void
-MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick *
- ACE_ENV_ARG_DECL)
+MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick *)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Refresh position
@@ -47,21 +46,20 @@ MyImpl::GPS_tracing_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);
}
// Operations from HUDisplay::position
CORBA::Long
-MyImpl::GPS_tracing_exec_i::posx (void)
+MyImpl::GPS_tracing_exec_i::posx ()
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->positionx_;
}
CORBA::Long
-MyImpl::GPS_tracing_exec_i::posy (void)
+MyImpl::GPS_tracing_exec_i::posy ()
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->positiony_;
@@ -70,8 +68,7 @@ MyImpl::GPS_tracing_exec_i::posy (void)
// Operations from Components::SessionComponent
void
MyImpl::GPS_tracing_exec_i::set_session_context (
- Components::SessionContext_ptr ctx
- ACE_ENV_ARG_DECL)
+ Components::SessionContext_ptr ctx)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
@@ -80,23 +77,22 @@ MyImpl::GPS_tracing_exec_i::set_session_context (
"MyImpl::GPS_tracing_exec_i::set_session_context\n"));
this->context_ =
- HUDisplay::CCM_GPS_Context::_narrow (ctx
- ACE_ENV_ARG_PARAMETER);
+ 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_tracing_exec_i::ciao_preactivate (void)
+MyImpl::GPS_tracing_exec_i::ciao_preactivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
}
void
-MyImpl::GPS_tracing_exec_i::ccm_activate (void)
+MyImpl::GPS_tracing_exec_i::ccm_activate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
@@ -105,14 +101,14 @@ MyImpl::GPS_tracing_exec_i::ccm_activate (void)
}
void
-MyImpl::GPS_tracing_exec_i::ciao_postactivate (void)
+MyImpl::GPS_tracing_exec_i::ciao_postactivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
}
void
-MyImpl::GPS_tracing_exec_i::ccm_passivate (void)
+MyImpl::GPS_tracing_exec_i::ccm_passivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
@@ -121,7 +117,7 @@ MyImpl::GPS_tracing_exec_i::ccm_passivate (void)
}
void
-MyImpl::GPS_tracing_exec_i::ccm_remove (void)
+MyImpl::GPS_tracing_exec_i::ccm_remove ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
@@ -144,7 +140,7 @@ MyImpl::GPSHome_tracing_exec_i::~GPSHome_tracing_exec_i ()
// Implicit home operations.
::Components::EnterpriseComponent_ptr
-MyImpl::GPSHome_tracing_exec_i::create (void)
+MyImpl::GPSHome_tracing_exec_i::create ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException))
{
diff --git a/CIAO/examples/Display/GPS/GPS_tracing_exec.h b/CIAO/examples/Display/GPS/GPS_tracing_exec.h
index eba841f735f..c6b67a34767 100644
--- a/CIAO/examples/Display/GPS/GPS_tracing_exec.h
+++ b/CIAO/examples/Display/GPS/GPS_tracing_exec.h
@@ -36,54 +36,52 @@ namespace MyImpl
// Operations from HUDisplay::GPS
virtual HUDisplay::CCM_position_ptr
- get_MyLocation (void)
+ get_MyLocation ()
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void
- push_Refresh (HUDisplay::tick *ev
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ push_Refresh (HUDisplay::tick *ev)
ACE_THROW_SPEC ((CORBA::SystemException));
// Operations from HUDisplay::position
virtual CORBA::Long
- posx (void)
+ posx ()
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::Long
- posy (void)
+ posy ()
ACE_THROW_SPEC ((CORBA::SystemException));
// Operations from Components::SessionComponent
virtual void
- set_session_context (Components::SessionContext_ptr ctx
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ set_session_context (Components::SessionContext_ptr ctx)
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
virtual void
- ciao_preactivate (void)
+ ciao_preactivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
virtual void
- ccm_activate (void)
+ ccm_activate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
virtual void
- ciao_postactivate (void)
+ ciao_postactivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
virtual void
- ccm_passivate (void)
+ ccm_passivate ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
virtual void
- ccm_remove (void)
+ ccm_remove ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
protected:
@@ -120,7 +118,7 @@ namespace MyImpl
// Implicit home operations.
virtual ::Components::EnterpriseComponent_ptr
- create (void)
+ create ()
ACE_THROW_SPEC ((CORBA::SystemException,
Components::CCMException));
};
View Lorry Controller Status