ChangeLogTag: Fri Aug 8 19:33:42 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>

2 files changed, 13 insertions, 6 deletions

diff --git a/ACE/Kokyu/DSRT_Sched_Queue_T.cpp b/ACE/Kokyu/DSRT_Sched_Queue_T.cpp
index ad6593e885d..e9888f7bc32 100644
--- a/ACE/Kokyu/DSRT_Sched_Queue_T.cpp
+++ b/ACE/Kokyu/DSRT_Sched_Queue_T.cpp
@@ -49,9 +49,11 @@ template <class DSRT_Scheduler_Traits,
 int Sched_Ready_Queue<DSRT_Scheduler_Traits,
                       More_Eligible_Comparator,
                       ACE_LOCK>::
-current_size ()
+current_size (void)
 {
-  return dispatch_items_prio_queue_.current_size ();
+  return
+    ACE_Utils::truncate_cast<int> (
+      dispatch_items_prio_queue_.current_size ());
 }
 
 template <class DSRT_Scheduler_Traits,
@@ -63,7 +65,9 @@ int Sched_Ready_Queue<DSRT_Scheduler_Traits,
 most_eligible (DSRT_Dispatch_Item_var<DSRT_Scheduler_Traits>& item)
 {
   if (dispatch_items_prio_queue_.current_size () == 0)
+    {
       return -1;
+    }
 
   PRIO_QUEUE_ITERATOR start = dispatch_items_prio_queue_.begin ();
   PRIO_QUEUE_ENTRY &ent = (*start);
diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.cpp b/ACE/Kokyu/Default_Dispatcher_Impl.cpp
index 4fdb0fa8164..8261486521c 100644
--- a/ACE/Kokyu/Default_Dispatcher_Impl.cpp
+++ b/ACE/Kokyu/Default_Dispatcher_Impl.cpp
@@ -7,7 +7,9 @@
 #include "Default_Dispatcher_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Kokyu, Default_Dispatcher_Impl, "$Id$")
+ACE_RCSID (Kokyu,
+           Default_Dispatcher_Impl,
+           "$Id$")
 
 namespace Kokyu
 {
@@ -23,11 +25,12 @@ Default_Dispatcher_Impl::init_i (const Dispatcher_Attributes& attrs)
   //create and init the dispatcher tasks here
 
   ACE_DEBUG ((LM_DEBUG, "entering init_t\n" ));
-  int size;
-  size = attrs.config_info_set_.size ();
+  int size = ACE_Utils::truncate_cast<int> (attrs.config_info_set_.size ());
 
   if (size == 0)
-    return -1;
+    {
+      return -1;
+    }
 
   this->ntasks_ = size;