summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Notify
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Notify')
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h10
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp3
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Consumer_T.h3
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushConsumer.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h3
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h3
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp3
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Supplier_T.h9
11 files changed, 19 insertions, 39 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
index d683c74edce..da0f8ad67b3 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
@@ -201,13 +201,11 @@ protected:
// = NotifyPublish method
virtual void offer_change (
const CosNotification::EventTypeSeq & added,
- const CosNotification::EventTypeSeq & removed
- );
+ const CosNotification::EventTypeSeq & removed);
// = StructuredPushSupplier methods
virtual void push_structured_event (
- const CosNotification::StructuredEvent & notification
- );
+ const CosNotification::StructuredEvent & notification);
virtual void disconnect_structured_push_consumer ();
};
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 7bc87083d6d..4b43325d224 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -1138,9 +1138,7 @@ Consumer_Main::find_notify_factory (void)
this->naming_context_->resolve (name);
this->ecf_ =
- CosNotifyChannelAdmin::EventChannelFactory::_narrow (
- obj.in ()
- );
+ CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
}
return ! CORBA::is_nil (this->ecf_.in ());
}
@@ -1399,9 +1397,7 @@ Consumer_Main::init_structured_proxy_supplier (void)
{
try
{
- proxy = this->sa_->get_proxy_supplier (
- this->structured_proxy_id_
- );
+ proxy = this->sa_->get_proxy_supplier (this->structured_proxy_id_);
ok = ! CORBA::is_nil (proxy.in ());
if (this->verbose_)
{
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index f1980469a0b..26f4b891391 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -101,15 +101,11 @@ public:
virtual void offer_change (
const CosNotification::EventTypeSeq & added,
- const CosNotification::EventTypeSeq & removed
- );
+ const CosNotification::EventTypeSeq & removed);
- virtual void push (
- const CORBA::Any & data
- );
+ virtual void push (const CORBA::Any & data);
- virtual void disconnect_push_consumer (
- );
+ virtual void disconnect_push_consumer ();
size_t received () const;
void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose);
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 7af8337bd6c..c550f4178fe 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -534,9 +534,7 @@ Supplier_Main::find_notify_factory (void)
this->naming_context_->resolve (name);
this->ecf_ =
- CosNotifyChannelAdmin::EventChannelFactory::_narrow (
- obj.in ()
- );
+ CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
}
return ! CORBA::is_nil (this->ecf_.in ());
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index a7bdfe5d17f..615acf230fe 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -28,8 +28,7 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (typename TAO_Notify_
CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
admin_ptr->obtain_notification_push_supplier (traits.type_
- , this->proxy_id_
- );
+ , this->proxy_id_);
ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 695d29076db..76a8e27df7f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -71,8 +71,7 @@ protected:
// = NotifyPublish method
virtual void offer_change (const CosNotification::EventTypeSeq & added,
- const CosNotification::EventTypeSeq & removed
- );
+ const CosNotification::EventTypeSeq & removed);
};
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index e9e3406e68e..27f11806aa7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -77,10 +77,8 @@ protected:
// = PushConsumer methods
virtual void disconnect_push_consumer (void);
- /// Default does nothing.
- void push (
- const CORBA::Any & data
- );
+ /// Default does nothing.
+ void push (const CORBA::Any & data);
};
#if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 05dec1bb49d..6bb54ea72d0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -79,8 +79,7 @@ protected:
/// Default does nothing.
virtual void push_structured_events (
- const CosNotification::EventBatch & notifications
- );
+ const CosNotification::EventBatch & notifications);
};
#if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 6c6e71a1749..3701c977647 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -79,8 +79,7 @@ protected:
/// Default does nothing.
virtual void push_structured_event (
- const CosNotification::StructuredEvent & notification
- );
+ const CosNotification::StructuredEvent & notification);
};
#if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 6620ef54e39..33fb119d383 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -28,8 +28,7 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (typename TAO_Notify_
CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
admin_ptr->obtain_notification_push_consumer (traits.type_
- , this->proxy_id_
- );
+ , this->proxy_id_);
ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index ce16c5c31a4..8b9e22292c8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -69,11 +69,10 @@ protected:
virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
, CosNotification::QoSProperties& qos);
- // = NotifySubscribe
- virtual void subscription_change (
- const CosNotification::EventTypeSeq & added,
- const CosNotification::EventTypeSeq & removed
- );
+ // = NotifySubscribe
+ virtual void subscription_change (
+ const CosNotification::EventTypeSeq & added,
+ const CosNotification::EventTypeSeq & removed);
};
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
View Lorry Controller Status