summaryrefslogtreecommitdiff
path: root/TAO/CIAO
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2004-11-12 12:21:50 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2004-11-12 12:21:50 +0000
commitb36c7d908f1e1ce7f9d7f496ad156538c1aa8880 (patch)
tree99bcc1c15ec3aa90883587139670f3192c403e7d /TAO/CIAO
parent17e921befd3d80976b3db136327b67aed7742d46 (diff)
downloadATCD-b36c7d908f1e1ce7f9d7f496ad156538c1aa8880.tar.gz
ChangeLogTag: Fri Nov 12 06:21:03 2004 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/CIAO')
-rw-r--r--TAO/CIAO/ChangeLog8
-rw-r--r--TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp4
-rw-r--r--TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h4
3 files changed, 12 insertions, 4 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 9d430e9937f..8f69b1e8879 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Nov 12 06:21:03 2004 Chad Elliott <elliott_c@ociweb.com>
+
+ * tests/RTCCM/Priority_Test/Controllers/Pulser.h:
+ * tests/RTCCM/Priority_Test/Controllers/Pulser.cpp:
+
+ Changed the open and close method of the Pulser class to match
+ the signature of the ACE_Task_Base.
+
Thu Nov 11 17:17:48 2004 Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
* ciao/Servant_Activator.cpp:
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp
index 6f4be265b19..51f563cd3c7 100644
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.cpp
@@ -24,13 +24,13 @@ PTImpl::Pulser::~Pulser ()
}
int
-PTImpl::Pulser::open ()
+PTImpl::Pulser::open (void*)
{
return this->activate ();
}
int
-PTImpl::Pulser::close ()
+PTImpl::Pulser::close (u_long)
{
this->done_ = 1;
this->reactor ()->notify ();
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h
index 67aa316f893..3986dc982da 100644
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/Controllers/Pulser.h
@@ -35,9 +35,9 @@ namespace PTImpl
Pulser (Pulse_Handler *cb);
~Pulser ();
- int open (void);
+ int open (void *args = 0);
- int close (void);
+ int close (u_long flags = 0);
int start (CORBA::Long hertz);