ChangeLogTag:Fri Apr 23 20:28:35 2004 Ossama Othman <ossama@dre.vanderbilt.edu>

6 files changed, 12 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2e7892764aa..e5801328028 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -30,6 +30,7 @@ Fri Apr 23 20:28:35 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 	* orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h:
 	* orbsvcs/orbsvcs/Sched/SchedEntry.h:
 	* orbsvcs/orbsvcs/Sched/SchedEntry.i:
+	* orbsvcs/orbsvcs/Sched/SchedEntry.cpp:
 	* orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
 	* orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
 	* orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp:
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index 632820180a4..835aa2362a7 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -222,7 +222,7 @@ Notifier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 }
 
-int
+bool
 Notifier_i::Consumer_Data::operator== (const Consumer_Data &rhs)
 {
   // The <_is_equivalent> function checks if the _var and _ptr objects
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index 26652a5b7d4..ed4397b76bd 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -91,7 +91,7 @@ public:
     // = TITLE
     //   Saves the Consumer_var and the threshold stock value.
   public:
-    int operator== (const Consumer_Data &rhs);
+    bool operator== (const Consumer_Data &rhs);
     // Comparison operator.
 
     Callback_Quoter::Consumer_var consumer_;
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp
index c3be95aab27..20c53f09dc2 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.cpp
+++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp
@@ -19,14 +19,15 @@
 
 #include "Broadcaster_i.h"
 
-int
+bool
 Broadcaster_i::Receiver_Data::operator == (const Broadcaster_i::Receiver_Data &receiver_data) const
 {
   // The <_is_equivalent> function checks if the _var and _ptr objects
   // are the same.  NOTE: this call might not behave well on other
   // ORBs since <_is_equivalent> isn't guaranteed to differentiate
   // object references.
-  return this->receiver_->_is_equivalent (receiver_data.receiver_.in ())
+  return
+    this->receiver_->_is_equivalent (receiver_data.receiver_.in ())
     && this->nickname_ == receiver_data.nickname_;
 }
 
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index e85a573ea80..cbe7272ad33 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -85,7 +85,7 @@ public:
     // = DESCRIPTION
     //   Saves the Receiver_var and user nickname.
   public:
-    int operator == (const Receiver_Data &receiver_data) const;
+    bool operator == (const Receiver_Data &receiver_data) const;
     // The == op required by the ACE_Unbounded set.
 
     Receiver_var receiver_;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 6c300c402bf..ea7a1da14bb 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -669,18 +669,18 @@ Dispatch_Entry::Dispatch_Entry (const Dispatch_Entry &d)
   dispatch_id_ = next_id_++;
 }
 
-int
+bool
 Dispatch_Entry::operator < (const Dispatch_Entry &d) const
 {
   // for positioning in the ordered dispatch multiset
 
   // lowest arrival time first
   if (this->arrival_ != d.arrival_)
-    return this->arrival_ < d.arrival_ ? 1 : 0;
+    return this->arrival_ < d.arrival_ ? true : false;
 
   // highest priority second
   if (this->priority_ != d.priority_)
-    return this->priority_ > d.priority_ ? 1 : 0;
+    return this->priority_ > d.priority_ ? true : false;
 
   // lowest laxity (highest dynamic sub-priority) third Just use low
   // 32 bits of worst_case_execution_time.  This will have to change
@@ -695,11 +695,11 @@ Dispatch_Entry::operator < (const Dispatch_Entry &d) const
   that_laxity -= d.task_entry ().rt_info ()->worst_case_execution_time;
 
   if (this_laxity != that_laxity)
-    return (this_laxity < that_laxity) ? 1 : 0;
+    return (this_laxity < that_laxity) ? true : false;
 
   // finally, by higher importance
   return (task_entry ().rt_info ()->importance >
-          d.task_entry ().rt_info ()->importance) ? 1 : 0;
+          d.task_entry ().rt_info ()->importance) ? true : false;
 }
 
 // ctor