summaryrefslogtreecommitdiff
path: root/TAO/tests/LongUpcalls
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-10-20 13:39:41 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-10-20 13:39:41 +0000
commitdd136d59a71de699b591819c37af09095c61ed81 (patch)
tree2f9376440001e27a8b174cfad10419788db7401a /TAO/tests/LongUpcalls
parentfcd791537786e096312822d5a4f12bf5c2691e13 (diff)
downloadATCD-dd136d59a71de699b591819c37af09095c61ed81.tar.gz
ChangeLogTag: Thu Oct 20 13:01:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/LongUpcalls')
-rw-r--r--TAO/tests/LongUpcalls/AMI_Manager.cpp8
-rw-r--r--TAO/tests/LongUpcalls/AMI_Manager.h4
-rw-r--r--TAO/tests/LongUpcalls/Manager_Handler.cpp4
-rw-r--r--TAO/tests/LongUpcalls/Manager_Handler.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index e244be88a2e..01b2d58bb9e 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -162,13 +162,13 @@ Controller_Handler::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
void
Controller_Handler::worker_started_excep
- (Test::AMI_ControllerExceptionHolder* h
+ (::Messaging::ExceptionHolder* h
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
- h->raise_worker_started (ACE_ENV_SINGLE_ARG_PARAMETER);
+ h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -190,13 +190,13 @@ Controller_Handler::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
void
Controller_Handler::worker_finished_excep
- (Test::AMI_ControllerExceptionHolder *h
+ (::Messaging::ExceptionHolder *h
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
- h->raise_worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER);
+ h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 9e1d360e5e8..5d7d6a82eec 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -63,12 +63,12 @@ public:
virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void worker_started_excep (Test::AMI_ControllerExceptionHolder*
+ virtual void worker_started_excep (::Messaging::ExceptionHolder*
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void worker_finished_excep (Test::AMI_ControllerExceptionHolder*
+ virtual void worker_finished_excep (::Messaging::ExceptionHolder*
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index 4223798dc86..c1532a2eb86 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -34,13 +34,13 @@ Manager_Handler::start_workers (ACE_ENV_SINGLE_ARG_DECL)
}
void
-Manager_Handler::start_workers_excep (Test::AMI_ManagerExceptionHolder * holder
+Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
- holder->raise_start_workers (ACE_ENV_SINGLE_ARG_PARAMETER);
+ holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index 742f4c76ca3..8ee1d472c2e 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -19,7 +19,7 @@ public:
// = The skeleton methods
virtual void start_workers (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void start_workers_excep (Test::AMI_ManagerExceptionHolder*
+ virtual void start_workers_excep (::Messaging::ExceptionHolder *holder
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));