summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-28 17:12:28 +0000
committerpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-28 17:12:28 +0000
commit495a3c099a34c1613527a698b5fca6b2d6b6694a (patch)
tree2d093fe1d4efad918b8d9a2eb8047ca4c9004d23
parent4b4a50ea768f13658b8db776d84433be81b46bf1 (diff)
downloadATCD-RT_Notification.tar.gz
ChangeLogTag:Wed May 28 11:22:29 2003 Pradeep Gore <pradeep@oomworks.com>RT_Notification
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 546f8f728b6..fb71d3b9bda 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -163,7 +163,7 @@ TAO_NS_Activation_Manager::activate_suppliers (void)
{
supplier = entry->int_id_;
- if (supplier->activate (this->barrier_) != 0)
+ if (supplier->activate_task (this->barrier_) != 0)
{
ACE_DEBUG ((LM_DEBUG, "Supplier list activation failed\n"));
return -1;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index 468a8e9911e..f666483188a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -150,7 +150,7 @@ TAO_NS_Periodic_Supplier::init_state (ACE_Arg_Shifter& arg_shifter)
}
int
-TAO_NS_Periodic_Supplier::activate (ACE_Barrier* barrier)
+TAO_NS_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
{
barrier_ = barrier;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index ea5be47d272..cc8d85ad2c2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -50,7 +50,7 @@ public:
int init_state (ACE_Arg_Shifter& arg_shifter);
/// Activate this task, synch on the given barrier.
- virtual int activate (ACE_Barrier* barrier);
+ virtual int activate_task (ACE_Barrier* barrier);
/// Connect.
void connect (CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr proxy, CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);