summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjohnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-02-11 17:10:56 +0000
committerjohnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-02-11 17:10:56 +0000
commit7be9f8be660d355a7d938b193110d2835d2a3e55 (patch)
treed1345b403341b48ff31d337a52d358ad9f61b459
parent40d0d2c9d03c4dbbe9ce202048300b443f849319 (diff)
downloadATCD-Bug_3193.tar.gz
ChangeLogTag: Mon Feb 11 17:00:23 UTC 2008 Ciju John <johnc at ociweb dot com>Bug_3193
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Test_i.cpp5
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Test_i.h15
3 files changed, 11 insertions, 15 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 21583d3c8eb..1cac7d94240 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 11 17:00:23 UTC 2008 Ciju John <johnc at ociweb dot com>
+
+ * tests/Oneway_Send_Timeouts/Test_i.h:
+ * tests/Oneway_Send_Timeouts/Test_i.cpp:
+ Remove ACE_THROW_SPEC.
+
Fri Feb 8 21:43:01 UTC 2008 Ciju John <johnc at ociweb dot com>
* tests/Oneway_Send_Timeouts/reactive_flush.conf:
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
index b472a1f8430..e4b74618733 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
@@ -16,7 +16,6 @@ Test_i::~Test_i ()
void
Test_i::sleep (CORBA::Long sec, CORBA::Long msec)
- ACE_THROW_SPEC ((::CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test_i::sleep> enter\n"));
sleep_ = true;
@@ -49,7 +48,6 @@ Test_i::sleep (CORBA::Long sec, CORBA::Long msec)
void
Test_i::unsleep ()
- ACE_THROW_SPEC ((::CORBA::SystemException))
{
sleep_ = false;
@@ -63,7 +61,6 @@ Test_i::unsleep ()
void
Test_i::dummy_one_way (const char* msg)
- ACE_THROW_SPEC ((::CORBA::SystemException))
{
if (msg != 0) {
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test_i::dummy_one_way> %.25s\n", msg));
@@ -73,14 +70,12 @@ Test_i::dummy_one_way (const char* msg)
void
Test_i::dummy_two_way ()
- ACE_THROW_SPEC ((::CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test_i::dummy_two_way>\n"));
}
void
Test_i::shutdown ()
- ACE_THROW_SPEC ((::CORBA::SystemException))
{
orb_->shutdown (0);
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test_i::shutdown>\n"));
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.h b/TAO/tests/Oneway_Send_Timeouts/Test_i.h
index 7bbc346cd26..a62a53cead8 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test_i.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.h
@@ -9,20 +9,15 @@ class Test_i : public virtual POA_Test
Test_i (CORBA::ORB_ptr orb);
virtual ~Test_i ();
- virtual void sleep (CORBA::Long sec, CORBA::Long msec)
- ACE_THROW_SPEC ((::CORBA::SystemException));
+ virtual void sleep (CORBA::Long sec, CORBA::Long msec);
- virtual void unsleep ()
- ACE_THROW_SPEC ((::CORBA::SystemException));
+ virtual void unsleep ();
- virtual void dummy_one_way (const char* msg)
- ACE_THROW_SPEC ((::CORBA::SystemException));
+ virtual void dummy_one_way (const char* msg);
- virtual void dummy_two_way ()
- ACE_THROW_SPEC ((::CORBA::SystemException));
+ virtual void dummy_two_way ();
- virtual void shutdown ()
- ACE_THROW_SPEC ((::CORBA::SystemException));
+ virtual void shutdown ();
private:
volatile bool sleep_;