summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-02-12 19:26:30 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-02-12 19:26:30 +0000
commitf842b2311dbfa6e9c9ee880ec31367f26b2a31c1 (patch)
tree4222d9804f5edfa9acc81d2a51f84e9939af9338
parent6a06a4554c7daddcc4f700561b2a079675c31ed0 (diff)
downloadATCD-f842b2311dbfa6e9c9ee880ec31367f26b2a31c1.tar.gz
Mon Feb 12 19:20:06 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h4
4 files changed, 6 insertions, 14 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 055dc246d98..28e30ac982b 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -662,9 +662,7 @@ ReconnectionCallback_i::reconnect_count () const
}
void
-ReconnectionCallback_i::reconnect (
- CORBA::Object_ptr reconnection
- ) ACE_THROW_SPEC ((CORBA::SystemException))
+ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Consumer received reconnection request\n")
@@ -686,7 +684,7 @@ ReconnectionCallback_i::reconnect (
CORBA::Boolean
ReconnectionCallback_i::is_alive (void)
{
- return CORBA::Boolean (1);
+ return true;
}
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index 61d18fb4638..68bb86c9588 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -150,9 +150,7 @@ public:
size_t reconnect_count () const;
- virtual void reconnect (
- CORBA::Object_ptr reconnection
- ) ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void reconnect (CORBA::Object_ptr reconnection);
virtual CORBA::Boolean is_alive (void);
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 4a22dbd01db..094db654538 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -108,9 +108,7 @@ ReconnectionCallback_i::reconnect_count () const
}
void
-ReconnectionCallback_i::reconnect (
- CORBA::Object_ptr reconnection
- ) ACE_THROW_SPEC ((CORBA::SystemException))
+ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Supplier received reconnection request\n")
@@ -132,7 +130,7 @@ ReconnectionCallback_i::reconnect (
CORBA::Boolean
ReconnectionCallback_i::is_alive (void)
{
- return CORBA::Boolean (1);
+ return true;
}
ReconnectionCallback_i::~ReconnectionCallback_i ()
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index 76790f3845c..35379931dc0 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -71,9 +71,7 @@ public:
size_t reconnect_count () const;
- virtual void reconnect (
- CORBA::Object_ptr reconnection
- ) ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void reconnect (CORBA::Object_ptr reconnection)
virtual CORBA::Boolean is_alive (void);