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/CSD_Strategy_Tests/TP_Foo_B | |
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/CSD_Strategy_Tests/TP_Foo_B')
4 files changed, 18 insertions, 56 deletions
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp index d48f56fc505..31b0d120dae 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp @@ -14,7 +14,6 @@ Callback_i::~Callback_i () void Callback_i::test_method(void) - ACE_THROW_SPEC((CORBA::SystemException)) { this->num_callbacks_ ++; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h index 86afee9b4f7..cb9b851c68e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h @@ -16,8 +16,7 @@ class CSD_TP_Foo_B_Export Callback_i virtual ~Callback_i(); - virtual void test_method(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_method(void); void gather_stats(Foo_B_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp index 0870febeb3c..730d8f2e922 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp @@ -23,7 +23,6 @@ Foo_B_i::~Foo_B_i() void Foo_B_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[0] ++; } @@ -31,7 +30,6 @@ Foo_B_i::op1(void) void Foo_B_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[1] ++; this->in_long_[1].push_back (value); @@ -40,7 +38,6 @@ Foo_B_i::op2(CORBA::Long value) CORBA::Long Foo_B_i::op3(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[2] ++; this->in_long_[2].push_back (value); @@ -50,7 +47,6 @@ Foo_B_i::op3(CORBA::Long value) void Foo_B_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[3] ++; this->in_long_[3].push_back (value); @@ -59,7 +55,6 @@ Foo_B_i::op4(CORBA::Long value) void Foo_B_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { this->op_count_[4] ++; throw FooException(); @@ -69,7 +64,6 @@ Foo_B_i::op5(void) CORBA::Boolean Foo_B_i::op6(const TimeOfDay& t, char*& message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[5] ++; char buf [20]; @@ -83,8 +77,6 @@ Foo_B_i::op6(const TimeOfDay& t, void Foo_B_i::op7(Callback_ptr cb) - ACE_THROW_SPEC((CORBA::SystemException, - FooException)) { this->op_count_[6] ++; @@ -104,7 +96,6 @@ Foo_B_i::op7(Callback_ptr cb) void Foo_B_i::test_unbounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[7] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_string_arg ") @@ -116,7 +107,6 @@ Foo_B_i::test_unbounded_string_arg(const char* message) void Foo_B_i::test_bounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[8] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_string_arg ") @@ -128,7 +118,6 @@ Foo_B_i::test_bounded_string_arg(const char* message) void Foo_B_i::test_fixed_array_arg(const Fixed_Array message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[9] ++; @@ -155,7 +144,6 @@ Foo_B_i::test_fixed_array_arg(const Fixed_Array message) void Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[10] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_var_size_arg ") @@ -167,7 +155,6 @@ Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message) void Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[11] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_var_size_arg ") @@ -179,7 +166,6 @@ Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message) void Foo_B_i::test_fixed_size_arg(const TimeOfDay& t) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(t); @@ -192,7 +178,6 @@ Foo_B_i::test_fixed_size_arg(const TimeOfDay& t) void Foo_B_i::test_var_array_arg(const Var_Array messages) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[13] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ") @@ -236,7 +221,6 @@ Foo_B_i::test_var_array_arg(const Var_Array messages) void Foo_B_i::test_special_basic_arg(CORBA::Boolean value, CORBA::Long client_id) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[14] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_special_basic_arg ") @@ -255,7 +239,6 @@ Foo_B_i::test_special_basic_arg(CORBA::Boolean value, void Foo_B_i::test_objref_arg(Callback_ptr cb) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(cb); this->op_count_[15] ++; @@ -266,7 +249,6 @@ Foo_B_i::test_objref_arg(Callback_ptr cb) void Foo_B_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { TheAppShutdown->client_done(); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h index 56d8109ed78..1a0367a27e7 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h @@ -14,59 +14,41 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B Foo_B_i(); virtual ~Foo_B_i(); - virtual void op1(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op1(void); - virtual void op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(CORBA::Long value); - virtual void op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op4(CORBA::Long value); - virtual void op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)); + virtual void op5(void); virtual CORBA::Boolean op6(const TimeOfDay& t, - char*& message) - ACE_THROW_SPEC((CORBA::SystemException)); + char*& message); - virtual void op7(Callback_ptr cb) - ACE_THROW_SPEC((CORBA::SystemException, - FooException)); + virtual void op7(Callback_ptr cb); - virtual void test_unbounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_unbounded_string_arg(const char* message); - virtual void test_bounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_bounded_string_arg(const char* message); - virtual void test_fixed_array_arg(const Fixed_Array message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_fixed_array_arg(const Fixed_Array message); - virtual void test_var_array_arg(const Var_Array messages) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_var_array_arg(const Var_Array messages); - virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message); - virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message); - virtual void test_fixed_size_arg(const TimeOfDay& t) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_fixed_size_arg(const TimeOfDay& t); virtual void test_special_basic_arg(CORBA::Boolean value, - CORBA::Long client_id) - ACE_THROW_SPEC((CORBA::SystemException)); + CORBA::Long client_id); - virtual void test_objref_arg(Callback_ptr cb) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_objref_arg(Callback_ptr cb); - virtual void done(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void done(void); void gather_stats (Foo_B_Statistics& stats); |