ChangeLogTag:Sat Mar 20 08:41:19 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

4 files changed, 37 insertions, 15 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index babd98f9a7f..18b13e8fb79 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Sat Mar 20 08:41:19 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
+	* examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
+	* examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
+
+	  We have seen this before and we will see it more and more. I am
+	  talking about the abuse/misuse of the environment macros. Fixed
+	  few such problems here. The tests should now compile in the
+	  daily builds. Thanks to Johnny for reporting it.
+
 Fri Mar 19 09:57:03 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index 786020c01d4..b62a826a657 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -45,7 +45,8 @@ FP_Segment_Sched_Param_Policy::value (
   this->value_ = value;
 }
 
-CORBA::Policy_ptr FP_Segment_Sched_Param_Policy::copy ()
+CORBA::Policy_ptr 
+FP_Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FP_Segment_Sched_Param_Policy* tmp;
@@ -57,15 +58,17 @@ CORBA::Policy_ptr FP_Segment_Sched_Param_Policy::copy ()
   return tmp;
 }
 
-void FP_Segment_Sched_Param_Policy::destroy ()
+void 
+FP_Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb,
-                              Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type,
-                              int ace_sched_policy,
-                              int ace_sched_scope)
+Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
+  CORBA::ORB_ptr orb,
+  Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type,
+  int ace_sched_policy,
+  int ace_sched_scope)
   : orb_ (orb),
     disp_impl_type_ (disp_impl_type),
     ace_sched_policy_ (ace_sched_policy),
@@ -94,8 +97,10 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb,
   ACE_CHECK;
 
   IOP::CodecFactory_var codec_factory;
-  CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory"
-                                                           ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = 
+    orb->resolve_initial_references ("CodecFactory"
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   if (CORBA::is_nil(obj.in ()))
     {
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index 5ec6d4e9fe3..dbc2f6262f0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -36,11 +36,13 @@ MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value
   this->value_ = value;
 }
 
-CORBA::Policy_ptr MIF_Sched_Param_Policy::copy ()
+CORBA::Policy_ptr 
+MIF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  MIF_Sched_Param_Policy* tmp;
-  ACE_NEW_THROW_EX (tmp, MIF_Sched_Param_Policy (*this),
+  MIF_Sched_Param_Policy* tmp = 0;
+  ACE_NEW_THROW_EX (tmp, 
+		    MIF_Sched_Param_Policy (*this),
                     CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -48,7 +50,8 @@ CORBA::Policy_ptr MIF_Sched_Param_Policy::copy ()
   return tmp;
 }
 
-void MIF_Sched_Param_Policy::destroy ()
+void 
+MIF_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 0742563b105..c93fe444a89 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -36,11 +36,13 @@ MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value
   this->value_ = value;
 }
 
-CORBA::Policy_ptr MUF_Sched_Param_Policy::copy ()
+CORBA::Policy_ptr 
+MUF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MUF_Sched_Param_Policy* tmp;
-  ACE_NEW_THROW_EX (tmp, MUF_Sched_Param_Policy (*this),
+  ACE_NEW_THROW_EX (tmp, 
+		    MUF_Sched_Param_Policy (*this),
                     CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -48,7 +50,8 @@ CORBA::Policy_ptr MUF_Sched_Param_Policy::copy ()
   return tmp;
 }
 
-void MUF_Sched_Param_Policy::destroy ()
+void 
+MUF_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }