ChangeLogTag: Tue Mar 30 19:32:19 UTC 2010 Olli Savia <ops@iki.fi>

12 files changed, 41 insertions, 26 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3a1f2fe0d91..32470b6a59e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,22 @@
+Tue Mar 30 19:32:19 UTC 2010  Olli Savia  <ops@iki.fi>
+
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
+        * examples/Kokyu_dsrt_schedulers/fp_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/fp_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/mif_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/mif_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/muf_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/muf_example/server.cpp:
+        * examples/RTScheduling/MIF_Scheduler/test.cpp:
+        * tao/RTScheduling/Current.cpp:
+          Fixed compile warnigs on LynxOS 4.2.
+
 Tue Mar 30 19:20:58 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp(create_event_consumer):
-        
+
           Added a check for exisiting event consumer before creating.
           Since event consumers are created for forward declared
           eventtypes, multiple forward declarations were causing
@@ -10,13 +25,13 @@ Tue Mar 30 19:20:58 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 Tue Mar 30 18:59:47 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
-        
-          Added 'this->' to method call on class member in 
+
+          Added 'this->' to method call on class member in
           generated code.
-          
+
         * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
         * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
-        
+
           Removed 'receptacle_objref_' class member and added
           temporary variable of the same type in each generated
           sendc_* operation.
@@ -24,7 +39,7 @@ Tue Mar 30 18:59:47 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 Tue Mar 30 18:20:44 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * MPC/config/taobaseidldefaults.mpb:
-        
+
           Improved handling of -Glem and -GM so that all generated
           files are removed. Thanks to Adam Mitz for explaining
           how to do this.
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index aae8f93cd82..5d68d0a216a 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -266,14 +266,14 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
                   guid->length ());
   */
   RTCORBA::Priority desired_priority;
-  if (CORBA::is_nil (sched_policy))
+  if (CORBA::is_nil (sched_policy.in ()))
     {
       desired_priority = 0;
     }
   else
     {
       FP_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_policy =
-        FP_Scheduling::SegmentSchedulingParameterPolicy::_narrow (sched_policy);
+        FP_Scheduling::SegmentSchedulingParameterPolicy::_narrow (sched_policy.in ());
 
       FP_Scheduling::SegmentSchedulingParameter sched_param =
         sched_param_policy->value ();
@@ -442,7 +442,7 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
 
   RTScheduling::Current::IdType_var guid = this->current_->id ();
 
-  if (CORBA::is_nil (sched_policy))
+  if (CORBA::is_nil (sched_policy.in ()))
   {
     ACE_DEBUG ((LM_DEBUG, "sched_policy nil. desired_priority not set in sched params\n"));
     desired_priority = 0;
@@ -452,7 +452,7 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
       ACE_DEBUG ((LM_DEBUG, "sched_policy not nil. desired_priority set in sched params\n"));
 
       FP_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_policy =
-        FP_Scheduling::SegmentSchedulingParameterPolicy::_narrow (sched_policy);
+        FP_Scheduling::SegmentSchedulingParameterPolicy::_narrow (sched_policy.in ());
 
       FP_Scheduling::SegmentSchedulingParameter sched_param =
         sched_param_policy->value ();
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index c17ebbdacba..e6a62ac3830 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -263,14 +263,14 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
                   guid->length ());
   */
   CORBA::Short importance;
-  if (CORBA::is_nil (sched_policy))
+  if (CORBA::is_nil (sched_policy.in ()))
     {
       importance = 0;
     }
   else
     {
       MIF_Scheduling::SchedulingParameterPolicy_var sched_param_policy =
-        MIF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy);
+        MIF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy.in ());
 
       MIF_Scheduling::SchedulingParameter_var sched_param = sched_param_policy->value ();
       importance = sched_param->importance;
@@ -430,7 +430,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
 
   RTScheduling::Current::IdType_var guid = this->current_->id ();
 
-  if (CORBA::is_nil (sched_policy))
+  if (CORBA::is_nil (sched_policy.in ()))
   {
 #ifdef KOKYU_DSRT_LOGGING
     ACE_DEBUG ((LM_DEBUG,
@@ -447,7 +447,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
                   "importance set in sched params\n"));
 #endif
       MIF_Scheduling::SchedulingParameterPolicy_var sched_param_policy =
-        MIF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy);
+        MIF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy.in ());
 
       MIF_Scheduling::SchedulingParameter_var sched_param = sched_param_policy->value ();
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 3ad7be56260..61af766408f 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -269,7 +269,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   CORBA::Long criticality;
   TimeBase::TimeT deadline,exec_time;
 
-  if (CORBA::is_nil (sched_policy))
+  if (CORBA::is_nil (sched_policy.in ()))
     {
       //24 hrs from now - infinity
       ACE_Time_Value deadline_tv = ACE_OS::gettimeofday () + ACE_Time_Value (24*60*60,0);
@@ -280,7 +280,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   else
     {
       MUF_Scheduling::SchedulingParameterPolicy_var sched_param_policy =
-        MUF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy);
+        MUF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy.in ());
 
       MUF_Scheduling::SchedulingParameter_var sched_param = sched_param_policy->value ();
       deadline = sched_param->deadline;
@@ -466,7 +466,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
 
   RTScheduling::Current::IdType_var guid = this->current_->id ();
 
-  if (CORBA::is_nil (sched_policy))
+  if (CORBA::is_nil (sched_policy.in ()))
   {
 #ifdef KOKYU_DSRT_LOGGING
     ACE_DEBUG ((LM_DEBUG,
@@ -486,7 +486,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
                   "sched params set\n"));
 #endif
       MUF_Scheduling::SchedulingParameterPolicy_var sched_param_policy =
-        MUF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy);
+        MUF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy.in ());
       MUF_Scheduling::SchedulingParameter_var sched_param = sched_param_policy->value ();
 
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 903861c8896..3bfe75ae31e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -171,7 +171,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj);
+            TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index e96c701e13a..7eb0de9fbb5 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj);
+            TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index 832769561a5..1ca7b10650d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -171,7 +171,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj);
+            TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index 38744bb405e..dad9b581cde 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj);
+            TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index e5c9e374b88..1536960eda0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -176,7 +176,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj);
+            TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index 0a4158c7153..c9b980e5e77 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj);
+            TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index f380bb8c448..98b846b0cfb 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -62,7 +62,7 @@ DT_Test::init (int argc, ACE_TCHAR *argv [])
 
   CORBA::Object_var manager_obj = orb_->resolve_initial_references ("RTSchedulerManager");
 
-  TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj);
+  TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
 
   ACE_NEW_RETURN (scheduler_,
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 0a6897df9ec..dff0f807e5a 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -489,7 +489,7 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start,
   // If no scheduling parameter is specified then use the current
   // implicit scheduling parameter as the scheduling parameter
   if (sched_param == 0)
-    sched_param = this->implicit_sched_param_;
+    sched_param = this->implicit_sched_param_.in ();
 
   RTScheduling::DistributableThread_var dt = TAO_DistributableThread_Factory::create_DT ();
   TAO_RTScheduler_Current_i *new_current = 0;