diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-12 11:52:38 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-12 11:52:38 +0000 |
commit | 4a94bf9e8e96ce495aedaf6ef0829e42a4489742 (patch) | |
tree | b1209abef436be321023aa6100646e884be3ada9 /TAO/tests/Bug_1270_Regression | |
parent | 1a4c23d60cf23b6e97877d6ecf77142e95e7b1fc (diff) | |
download | ATCD-4a94bf9e8e96ce495aedaf6ef0829e42a4489742.tar.gz |
Mon Feb 12 11:40:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/Bug_1270_Regression')
-rw-r--r-- | TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc | 2 | ||||
-rw-r--r-- | TAO/tests/Bug_1270_Regression/Echo.cpp | 1 | ||||
-rw-r--r-- | TAO/tests/Bug_1270_Regression/Echo.h | 3 | ||||
-rw-r--r-- | TAO/tests/Bug_1270_Regression/Echo_Caller.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Bug_1270_Regression/Echo_Caller.h | 6 |
5 files changed, 3 insertions, 11 deletions
diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc index a594a344e69..02d77667b22 100644 --- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc +++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc @@ -23,7 +23,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl - after += *Server Source_Files { Echo.cpp client.cpp @@ -36,7 +35,6 @@ project(*Client): taoclient, messaging { project(*Shutdown): taoexe, messaging { after += *idl - after += *Client Source_Files { shutdown.cpp TestC.cpp diff --git a/TAO/tests/Bug_1270_Regression/Echo.cpp b/TAO/tests/Bug_1270_Regression/Echo.cpp index b41ec6256ab..d9c971f82e3 100644 --- a/TAO/tests/Bug_1270_Regression/Echo.cpp +++ b/TAO/tests/Bug_1270_Regression/Echo.cpp @@ -20,7 +20,6 @@ Echo::Echo(CORBA::ORB_ptr orb, void Echo::echo_payload(Test::Payload const &) - ACE_THROW_SPEC((CORBA::SystemException)) { this->abort_counter_--; diff --git a/TAO/tests/Bug_1270_Regression/Echo.h b/TAO/tests/Bug_1270_Regression/Echo.h index 5e835b6396a..d27ad1508a7 100644 --- a/TAO/tests/Bug_1270_Regression/Echo.h +++ b/TAO/tests/Bug_1270_Regression/Echo.h @@ -18,8 +18,7 @@ public: Echo(CORBA::ORB_ptr orb, int abort_counter); - virtual void echo_payload (Test::Payload const & data) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void echo_payload (Test::Payload const & data); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp index bf42f0b83d5..e49c9c4c970 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp @@ -19,7 +19,6 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) void Echo_Caller::start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)) { Server_Timer * task = new Server_Timer(client, orb_->orb_core()->reactor()); @@ -32,7 +31,6 @@ Echo_Caller::start_task(Test::Echo_ptr client) void Echo_Caller::shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); orb_->shutdown(0); diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.h b/TAO/tests/Bug_1270_Regression/Echo_Caller.h index e2a476e4052..f0fb687d956 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.h @@ -16,11 +16,9 @@ class Echo_Caller : public POA_Test::Echo_Caller public: Echo_Caller(CORBA::ORB_ptr orb); - virtual void start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void start_task(Test::Echo_ptr client); - virtual void shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void shutdown(void); private: CORBA::ORB_var orb_; |