fixed compilation errors on UNIX platforms for scheduling anomaly features

6 files changed, 59 insertions, 10 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 9a2a885c9ae..d0e8cba328d 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,12 @@
+Tue Nov 10 13:12:48 1998  Chris Gill  <cdgill@cs.wustl.edu>
+
+        * orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+          orbsvcs/orbsvcs/Scheduler_Factory.cpp
+          orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+          orbsvcs/orbsvcs/Sched/DynSched.cpp
+          orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: Fixed compilation errors 
+          and warnings from g++, Sun C++ for scheduling anomaly features.
+
 Mon Nov  9 23:47:02 1998  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
 
 	* examples/Callback_Quoter/Notifier_i.cpp
@@ -54,7 +63,8 @@ Mon Nov 09 18:12:48 1998  Chris Gill  <cdgill@cs.wustl.edu>
           Implemented anomaly recording in the strategized
           scheduler so all warning and error level scheduling anomalies
           can be propagated to generated runtime header file without
-          halting the scheduler except for a fatal anomaly.
+          halting the scheduler (except for a fatal anomaly).  Thanks to 
+          Tom Venturella <thomas.e.venturella@boeing.com> for suggesting this.
 
         * orbsvcs/tests/Sched_Conf/Sched_Conf.{cpp, dsw}
           orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.{cpp, dsp}
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index f4179e5af5c..19c24641ebb 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -56,6 +56,7 @@ main (int argc, char *argv[])
 
       RtecScheduler::RT_Info_Set_var infos;
       RtecScheduler::Config_Info_Set_var configs;
+      RtecScheduler::Scheduling_Anomaly_Set_var anomalies;
 
 #if defined (__SUNPRO_CC)
       // Sun C++ 4.2 warns with the code below:
@@ -70,25 +71,27 @@ main (int argc, char *argv[])
 
       RtecScheduler::RT_Info_Set_out infos_out (infos);
       RtecScheduler::Config_Info_Set_out configs_out (configs);
+      RtecScheduler::Scheduling_Anomaly_Set_out anomalies_out (anomalies);
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, TAO_TRY_ENV);
+         infos_out, configs_out, anomalies_out, TAO_TRY_ENV);
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
 	(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
 					 ACE_SCOPE_THREAD),
 	 ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
 					 ACE_SCOPE_THREAD),
-	 infos.out (), configs.out (), TAO_TRY_ENV);
+	 infos.out (), configs.out (), anomalies.out (), TAO_TRY_ENV);
 #endif /* ! __SUNPRO_CC */
 
       TAO_CHECK_ENV;
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (), 
                                             configs.in (),
+                                            anomalies.in (),
                                             "Scheduler_Runtime.cpp");
     }
   TAO_CATCH (CORBA::SystemException, sys_ex)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index ec5da0f4ae5..997c74dffeb 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -324,7 +324,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
         ACE_DEBUG ((LM_DEBUG, 
                     "%s: %s\n",
                     anomaly_severity_msg,
-                    (*anomaly)->description));
+                    (const char*) ((*anomaly)->description)));
 
         // Store the anomaly in the anomaly sequence out parameter
         anomalies[anomaly_index] = **anomaly;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 6f71fd94198..aa6d616a28d 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -160,7 +160,6 @@ ACE_DynScheduler::anomaly_severity (ACE_DynScheduler::status_t status)
     case ST_CYCLE_IN_DEPENDENCIES :
     case ST_INVALID_PRIORITY_ORDERING :
       return RtecScheduler::ANOMALY_ERROR;
-      break;
 
     // Warnings reflect serious problems with given scheduling information
     case ST_TASK_ALREADY_REGISTERED :
@@ -172,12 +171,10 @@ ACE_DynScheduler::anomaly_severity (ACE_DynScheduler::status_t status)
     case UNRECOGNIZED_INFO_TYPE :
     case ST_NO_TASKS_REGISTERED :
       return RtecScheduler::ANOMALY_WARNING;
-      break;
 
     // Produce a lowest severity anomaly for any unknown status value
     default:
       return RtecScheduler::ANOMALY_NONE;
-      break;
   }
 }
 
@@ -770,6 +767,9 @@ ACE_DynScheduler::schedule (
                 status_ = temp_status;
               }
             break;
+
+          default:
+            break;
         }
     }
 
@@ -796,6 +796,9 @@ ACE_DynScheduler::schedule (
                 status_ = temp_status;
               }
             break;
+
+          default:
+            break;
         }
     }
 
@@ -822,6 +825,9 @@ ACE_DynScheduler::schedule (
                 status_ = temp_status;
               }
             break;
+
+          default:
+            break;
         }
     }
 
@@ -849,6 +855,9 @@ ACE_DynScheduler::schedule (
                 status_ = temp_status;
               }
             break;
+
+          default:
+            break;
         }
     }
 
@@ -875,6 +884,9 @@ ACE_DynScheduler::schedule (
                 status_ = temp_status;
               }
             break;
+
+          default:
+            break;
         }
     }
 
@@ -911,6 +923,9 @@ ACE_DynScheduler::schedule (
                 status_ = temp_status;
               }
             break;
+
+          default:
+            break;
         }
     }
 
@@ -947,6 +962,9 @@ ACE_DynScheduler::schedule (
                 status_ = temp_status;
               }
             break;
+
+          default:
+            break;
         }
     }
 
@@ -986,6 +1004,9 @@ ACE_DynScheduler::schedule (
                     status_ = temp_status;
                   }
                 break;
+
+              default:
+                break;
             }
         }
 
@@ -1022,6 +1043,9 @@ ACE_DynScheduler::schedule (
                     status_ = temp_status;
                   }
                 break;
+
+              default:
+                break;
             }
         }
     }
@@ -2276,6 +2300,9 @@ template class ACE_Unbounded_Set_Iterator<Task_Entry_Link *>;
 template class ACE_Node<RtecScheduler::Config_Info *>;
 template class ACE_Unbounded_Set<RtecScheduler::Config_Info *>;
 template class ACE_Unbounded_Set_Iterator<RtecScheduler::Config_Info *>;
+template class ACE_Node<RtecScheduler::Scheduling_Anomaly *>;
+template class ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *>;
+template class ACE_Unbounded_Set_Iterator<RtecScheduler::Scheduling_Anomaly *>;
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Map_Entry<ACE_CString, RtecScheduler::RT_Info *>
 #pragma instantiate ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, ACE_SYNCH_MUTEX>
@@ -2302,6 +2329,12 @@ template class ACE_Unbounded_Set_Iterator<RtecScheduler::Config_Info *>;
 #pragma instantiate ACE_Node<RtecScheduler::Config_Info *>
 #pragma instantiate ACE_Unbounded_Set<RtecScheduler::Config_Info *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<RtecScheduler::Config_Info *>
+#pragma instantiate ACE_Node<RtecScheduler::Scheduling_Anomaly *>
+#pragma instantiate ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<RtecScheduler::Scheduling_Anomaly *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+
+
+
 // EOF
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index c9d12bf2d0e..cf83be128c4 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -287,7 +287,7 @@ int ACE_Scheduler_Factory::dump_schedule
             break;
         }
 
-      ACE_OS::fprintf (file, "%s\n", anomaly.description);
+      ACE_OS::fprintf (file, "%s\n", (const char*) anomaly.description);
     }
 
   // Print out operation QoS info.
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 901708a087c..2839f8ba9a0 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -556,6 +556,7 @@ Test_ECG::run (int argc, char* argv[])
         {
           RtecScheduler::RT_Info_Set_var infos;
           RtecScheduler::Config_Info_Set_var configs;
+          RtecScheduler::Scheduling_Anomaly_Set_var anomalies;
 
 #if defined (__SUNPRO_CC)
           // Sun C++ 4.2 warns with the code below:
@@ -570,24 +571,26 @@ Test_ECG::run (int argc, char* argv[])
 
           RtecScheduler::RT_Info_Set_out infos_out (infos);
           RtecScheduler::Config_Info_Set_out configs_out (configs);
+          RtecScheduler::Scheduling_Anomaly_Set_out anomalies_out (anomalies);
           ACE_Scheduler_Factory::server ()->compute_scheduling
             (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out, configs_out, TAO_TRY_ENV);
+             infos_out, configs_out, anomalies_out, TAO_TRY_ENV);
 #else  /* ! __SUNPRO_CC */
           ACE_Scheduler_Factory::server ()->compute_scheduling
             (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos.out (), configs.out (), TAO_TRY_ENV);
+             infos.out (), configs.out (), anomalies.out (), TAO_TRY_ENV);
 #endif /* ! __SUNPRO_CC */
 
           TAO_CHECK_ENV;
           ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                                 configs.in (),
+                                                anomalies.in (),
                                                 this->schedule_file_);
         }