summaryrefslogtreecommitdiff
path: root/TAO/tests/BiDirectional
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-02-12 11:52:38 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-02-12 11:52:38 +0000
commit4fdec6166faa49ba30203ceef9a5b4ae6a1c67f0 (patch)
treeb1209abef436be321023aa6100646e884be3ada9 /TAO/tests/BiDirectional
parentc06f33dc53a43bfee6d0a4a1bce2fde4baa2d33a (diff)
downloadATCD-4fdec6166faa49ba30203ceef9a5b4ae6a1c67f0.tar.gz
Mon Feb 12 11:40:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/BiDirectional')
-rw-r--r--TAO/tests/BiDirectional/test_i.cpp5
-rw-r--r--TAO/tests/BiDirectional/test_i.h15
2 files changed, 5 insertions, 15 deletions
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index dedcddd24ec..a5679c92250 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -15,7 +15,6 @@ ACE_RCSID(BiDirectional, test_i, "$Id$")
void
Callback_i::shutdown (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
this->orb_->shutdown (0);
@@ -23,7 +22,6 @@ Callback_i::shutdown (void)
void
Callback_i::callback_method ( /**/)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
@@ -35,7 +33,6 @@ Callback_i::callback_method ( /**/)
CORBA::Long
Simple_Server_i::test_method (CORBA::Boolean do_callback
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (do_callback)
{
@@ -48,7 +45,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
void
Simple_Server_i::callback_object (Callback_ptr callback
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// Store the callback object
this->callback_ = Callback::_duplicate (callback);
@@ -87,7 +83,6 @@ Simple_Server_i::call_client (void)
void
Simple_Server_i::shutdown (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0);
}
diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h
index 33333f74968..cc4725dc141 100644
--- a/TAO/tests/BiDirectional/test_i.h
+++ b/TAO/tests/BiDirectional/test_i.h
@@ -31,12 +31,10 @@ public:
Callback_i (CORBA::ORB_ptr orb);
// ctor
- void shutdown (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void shutdown (void);
// Safe way to shutdown
- void callback_method (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void callback_method (void);
// The callback method
private:
@@ -58,14 +56,11 @@ public:
// ctor
// = The Simple_Server methods.
- CORBA::Long test_method (CORBA::Boolean do_callback)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ CORBA::Long test_method (CORBA::Boolean do_callback);
- void callback_object (Callback_ptr callback)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void callback_object (Callback_ptr callback);
- void shutdown (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ void shutdown (void);
int call_client (void);