summaryrefslogtreecommitdiff
path: root/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2007-01-25 18:20:09 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2007-01-25 18:20:09 +0000
commit39c2954071f9c9a5f71c72953c2c0264eb291c91 (patch)
treeef235cfa5f0e9ce7e3099e771ec429157d94d73d /CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
parent528474110ea3692de384e7d5e906b8e021eae7ad (diff)
downloadATCD-39c2954071f9c9a5f71c72953c2c0264eb291c91.tar.gz
ChangeLogTag: Thu Jan 25 18:18:58 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp')
-rw-r--r--CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp35
1 files changed, 13 insertions, 22 deletions
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
index c06e6460e03..4318902bc32 100644
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
+++ b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
@@ -42,8 +42,7 @@ namespace CIAO
void
LocationUpdater_exec_i::push_deployment (
- ::CIAO::RACE::Deploy_Input * ev
- ACE_ENV_ARG_DECL_NOT_USED)
+ ::CIAO::RACE::Deploy_Input * ev)
ACE_THROW_SPEC ((CORBA::SystemException))
{
bool plan_exists = false;
@@ -103,7 +102,7 @@ namespace CIAO
ACE_ERROR ((LM_ERROR,
"Unable to acquire RepositoryManagerDaemon's objref\n"));
- ACE_THROW (CORBA::INTERNAL ());
+ throw CORBA::INTERNAL ();
}
//now obtian the corresponding PackageConfiguration from
@@ -126,7 +125,7 @@ namespace CIAO
ACE_ERROR ((LM_ERROR,
"Error! Package not found! Location update failed!\n"));
- ACE_THROW (CORBA::INTERNAL ());
+ throw CORBA::INTERNAL ();
}
catch (CORBA::Exception &)
@@ -134,7 +133,7 @@ namespace CIAO
ACE_ERROR ((LM_ERROR,
"Error! General exception! Location update failed!\n"));
- ACE_THROW (CORBA::INTERNAL ());
+ throw CORBA::INTERNAL ();
}
//now update the plan
@@ -196,26 +195,23 @@ namespace CIAO
void
LocationUpdater_exec_i::set_session_context (
- ::Components::SessionContext_ptr ctx
- ACE_ENV_ARG_DECL)
+ ::Components::SessionContext_ptr ctx)
ACE_THROW_SPEC ((
::CORBA::SystemException,
::Components::CCMException))
{
this->context_ =
LocationUpdater_Context::_narrow (
- ctx
- ACE_ENV_ARG_PARAMETER);
+ ctx);
if (this->context_ == 0)
{
- ACE_THROW (CORBA::INTERNAL ());
+ throw CORBA::INTERNAL ();
}
}
void
- LocationUpdater_exec_i::ciao_preactivate (
- ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ LocationUpdater_exec_i::ciao_preactivate ()
ACE_THROW_SPEC ((
::CORBA::SystemException,
::Components::CCMException))
@@ -224,8 +220,7 @@ namespace CIAO
}
void
- LocationUpdater_exec_i::ciao_postactivate (
- ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ LocationUpdater_exec_i::ciao_postactivate ()
ACE_THROW_SPEC ((
::CORBA::SystemException,
::Components::CCMException))
@@ -234,8 +229,7 @@ namespace CIAO
}
void
- LocationUpdater_exec_i::ccm_activate (
- ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ LocationUpdater_exec_i::ccm_activate ()
ACE_THROW_SPEC ((
::CORBA::SystemException,
::Components::CCMException))
@@ -244,8 +238,7 @@ namespace CIAO
}
void
- LocationUpdater_exec_i::ccm_passivate (
- ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ LocationUpdater_exec_i::ccm_passivate ()
ACE_THROW_SPEC ((
::CORBA::SystemException,
::Components::CCMException))
@@ -254,8 +247,7 @@ namespace CIAO
}
void
- LocationUpdater_exec_i::ccm_remove (
- ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ LocationUpdater_exec_i::ccm_remove ()
ACE_THROW_SPEC ((
::CORBA::SystemException,
::Components::CCMException))
@@ -286,8 +278,7 @@ namespace CIAO
// Implicit operations.
::Components::EnterpriseComponent_ptr
- LocationUpdater_Home_exec_i::create (
- ACE_ENV_SINGLE_ARG_DECL)
+ LocationUpdater_Home_exec_i::create ()
ACE_THROW_SPEC ((
::CORBA::SystemException,
::Components::CCMException))