summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2003-12-15 19:40:13 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2003-12-15 19:40:13 +0000
commitc07c365199ef2acc0f4c4e723efcee19aea288c3 (patch)
tree4da3e80a883d2684d9cbccfc743d4ba7c3002aa8
parent00bd2303e3e863eec44de692fa44f47cb8c42629 (diff)
downloadATCD-c07c365199ef2acc0f4c4e723efcee19aea288c3.tar.gz
ChangeLogTag:Mon Dec 15 18:51:15 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog6
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.cpp5
-rw-r--r--tests/Proactor_Test.cpp5
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e59a5b93149..3052dda6b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,9 +7,11 @@ Mon Dec 15 18:51:15 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
Mon Dec 15 11:09:45 2003 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
- * ace/POSIX_CB_Proactor.cpp (ACE_POSIX_CB_Proactor): Added a
+ * tests/Proactor_Test.cpp (ACE_MT_SYNCH>):
+ * ace/POSIX_CB_Proactor.cpp (ACE_POSIX_CB_Proactor): Added a
cast to (unsigned int) so things will work properly for the
- ACE_Thread_Semaphore.
+ ACE_Thread_Semaphore. Thanks to Bala and Don Hinton for
+ reporting these problems.
Mon Dec 15 10:11:31 2003 Chad Elliott <elliott_c@ociweb.com>
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 3cf6f059d80..fc25ec70820 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -108,14 +108,15 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
THR_JOINABLE |
this->orb_->orb_core ()->orb_params ()->thread_creation_flags ();
- int priority = ACE_Sched_Params::priority_min (this->orb_->orb_core ()->orb_params ()->sched_policy ()
- , this->orb_->orb_core ()->orb_params ()->scope_policy ());
+ int priority = ACE_Sched_Params::priority_min (this->orb_->orb_core ()->orb_params ()->sched_policy (),
+ this->orb_->orb_core ()->orb_params ()->scope_policy ());
if (worker_.activate (flags,
this->nthreads_, 0, priority) != 0)
ACE_ERROR_RETURN ((LM_ERROR,
"Cannot activate client threads\n"), -1);
}
+
// Check first if the naming service
if (this->use_name_svc_)
{
diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp
index 59f217bc23e..5940581c384 100644
--- a/tests/Proactor_Test.cpp
+++ b/tests/Proactor_Test.cpp
@@ -156,7 +156,10 @@ disable_signal (int sigmin, int sigmax)
class MyTask : public ACE_Task<ACE_MT_SYNCH>
{
public:
- MyTask (void): lock_ (), sem_ (0), proactor_(0) {}
+ MyTask (void):
+ lock_ (),
+ sem_ ((unsigned int) 0),
+ proactor_(0) {}
virtual ~MyTask()
{