summaryrefslogtreecommitdiff
path: root/TAO/examples
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples')
-rw-r--r--TAO/examples/RTCORBA/Activity/Periodic_Task.cpp2
-rw-r--r--TAO/examples/RTCORBA/Activity/Periodic_Task.h4
-rw-r--r--TAO/examples/RTCORBA/Activity/Thread_Task.cpp3
-rw-r--r--TAO/examples/RTCORBA/Activity/Thread_Task.h2
4 files changed, 5 insertions, 6 deletions
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
index 7e0ad321c6c..03a87bb3a6c 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
@@ -26,7 +26,7 @@ Periodic_Task::~Periodic_Task ()
}
int
-Periodic_Task::init (ACE_Arg_Shifter& arg_shifter)
+Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter)
{
const ACE_TCHAR *current_arg = 0;
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index 1864e0d7177..a8639777508 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -35,10 +35,10 @@ class Periodic_Task : public ACE_Task <ACE_SYNCH>
~Periodic_Task ();
/// Init the state of this object.
- int init (ACE_Arg_Shifter& arg_shifter);
+ int init_task (ACE_Arg_Shifter& arg_shifter);
/// Activate this task, synch on the given barrier.
- virtual int activate (ACE_Barrier* barrier) = 0;
+ virtual int activate_task (ACE_Barrier* barrier) = 0;
/// Dump the stats collected.
void dump_stats (ACE_TCHAR* msg);
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
index 19cb43fb712..16690bc5a9e 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
@@ -12,7 +12,7 @@ Thread_Task::Thread_Task (void)
}
int
-Thread_Task::activate (ACE_Barrier* barrier)
+Thread_Task::activate_task (ACE_Barrier* barrier)
{
barrier_ = barrier;
@@ -134,4 +134,3 @@ Thread_Task::svc (void)
return 0;
}
-
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h
index 0feeb7a8f8b..3e7db446563 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h
@@ -34,7 +34,7 @@ class Thread_Task : public Periodic_Task
Thread_Task (void);
/// Activate thread(s).
- virtual int activate (ACE_Barrier* barrier);
+ virtual int activate_task (ACE_Barrier* barrier);
protected: