diff options
20 files changed, 70 insertions, 46 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ea31b21a03a..7938b18981e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,11 +1,35 @@ +Fri Jul 8 11:15:00 2005 Justin Michel <michel_j@ociweb.com> + + * orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp: + * orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp: + * orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp: + * orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp: + * orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/lib/PushConsumer.cpp: + * orbsvcs/tests/Notify/lib/PushSupplier.cpp: + * orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp: + * orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp: + * orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp: + * orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp: + * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp: + * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp: + + Add NOT_USED where appropriate to exception macros. + Fri Jul 8 16:03:46 2005 Boris Kolpackov <boris@kolpackov.net> - * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp: - * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp: - * orbsvcs/examples/Notify/Federation/Gate/Gate.h: - * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp: + * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp: + * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp: + * orbsvcs/examples/Notify/Federation/Gate/Gate.h: + * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp: - Made the code compile on platforms with emulated exceptions. + Made the code compile on platforms with emulated exceptions. Fri Jul 8 14:06:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> @@ -14,13 +38,13 @@ Fri Jul 8 14:06:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> Fri Jul 8 15:32:36 2005 Boris Kolpackov <boris@kolpackov.net> - * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp: - * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp: - * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp: + * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp: + * orbsvcs/examples/Notify/Federation/Gate/Gate.cpp: + * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp: - Changed all references to TAO_Notify_Service:init to read - init_service because somebody decided for some reason to - rename this function. Also made the code compilable by VC6. + Changed all references to TAO_Notify_Service:init to read + init_service because somebody decided for some reason to + rename this function. Also made the code compilable by VC6. Fri Jul 8 12:38:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp index ac19564c403..716e1747ebe 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -39,13 +39,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -126,7 +126,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec static void -SendEvent (int id ACE_ENV_ARG_DECL) +SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED) { CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp index f4abe8704a7..4a34581b4f4 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp @@ -89,7 +89,7 @@ Notify_Sequence_Push_Consumer::_connect ( void Notify_Sequence_Push_Consumer::push_structured_events ( const CosNotification::EventBatch& events - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ++count_; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp index 70c39507e65..95d08daca21 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp @@ -53,13 +53,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp index 5e5114f6ac8..9fee28c5c34 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp @@ -44,13 +44,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp index 3115f77345d..4612ff106bf 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp @@ -41,13 +41,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -137,7 +137,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec static void -SendEvent (int id ACE_ENV_ARG_DECL) +SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED) { ACE_UNUSED_ARG(id); CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index f2be0c3074e..c1d572de8c2 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -30,13 +30,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index cd55f00574f..bda45d89f6c 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -29,13 +29,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -150,7 +150,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec static void -SendEvent (int id ACE_ENV_ARG_DECL) +SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED) { CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp index 66f3f4a0779..37b4b88817a 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp @@ -40,13 +40,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index adba9d244a7..9780f449ca7 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp @@ -42,13 +42,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp index d65dc1aeea0..9c382d3239d 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp @@ -31,13 +31,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index 8a6f494d006..ad86fd1c81a 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -32,13 +32,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp index eb8655d9f84..e6d8a4c3bb2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp @@ -37,7 +37,7 @@ TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp index eae01f04313..61b910e1184 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp @@ -46,7 +46,7 @@ TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp index 4b7cc341eaf..2d08556cf7b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp @@ -38,7 +38,7 @@ TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG } void -TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp index a86df08fa35..ab8c50d2d9d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp @@ -48,7 +48,7 @@ TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG } void -TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp index 540ff8474f0..85238647164 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp @@ -38,7 +38,7 @@ TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_A } void -TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp index a6f3f9e8a71..6628fde9676 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp @@ -49,7 +49,7 @@ TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_A } void -TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp index a6cd302367f..b504d53742a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp @@ -40,13 +40,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp index 64463e9ee0e..f89028a58c1 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp @@ -39,13 +39,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL) + void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL) + void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -128,7 +128,7 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec static void -SendEvent (int id ACE_ENV_ARG_DECL) +SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED) { const char* type = ( (id & 1) == 1 ? "odd" : "even" ); CosNotification::StructuredEvent event; |