Wed Nov 4 11:16:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/ComponentServer/CIAO_ComponentServer.cpp:
        * ciao/ComponentServer/CIAO_ComponentServer.h:
          Removed more deprecated code

        * ciao/ComponentServer/CIAO_Container_Impl.h
          Layout change

4 files changed, 10 insertions, 52 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d283686f275..7304a7691fd 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Nov  4 11:16:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/ComponentServer/CIAO_ComponentServer.cpp:
+        * ciao/ComponentServer/CIAO_ComponentServer.h:
+          Removed more deprecated code
+
+        * ciao/ComponentServer/CIAO_Container_Impl.h
+          Layout change
+
 Wed Nov  4 11:07:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * MPC/config/ciao_componentserver_configurator.mpb:
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp
index 3ab8953ef90..9ca7b5dd4ef 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp
@@ -341,53 +341,6 @@ namespace CIAO
 
     }
 
-    const char *
-    ComponentServer_Task::sched_policy_name (int sched_policy)
-    {
-      const char *name = 0;
-
-      switch (sched_policy)
-        {
-        case ACE_SCHED_OTHER:
-          name = "SCHED_OTHER";
-          break;
-        case ACE_SCHED_RR:
-          name = "SCHED_RR";
-          break;
-        case ACE_SCHED_FIFO:
-          name = "SCHED_FIFO";
-          break;
-        }
-
-      return name;
-    }
-
-    /// The following check is taken from $(TAO_ROOT)/tests/RTCORBA/
-    void
-    ComponentServer_Task::check_supported_priorities (void)
-    {
-      CIAO_TRACE ("ComponentServer_Task::check_supported_priorities");
-
-      int const sched_policy =
-        this->orb_->orb_core ()->orb_params ()->ace_sched_policy ();
-
-      // Check that we have sufficient priority range to run,
-      // i.e., more than 1 priority level.
-      int const max_priority = ACE_Sched_Params::priority_max (sched_policy);
-      int const min_priority = ACE_Sched_Params::priority_min (sched_policy);
-
-      if (max_priority == min_priority)
-        {
-          CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::check_supported_priorities - "
-                      " Not enough priority levels with the %C scheduling policy\n"
-                      "on this platform to run, terminating ....\n"
-                      "Check svc.conf options\n",
-                      sched_policy_name (sched_policy)));
-
-          throw Error ("Bad scheduling policy.");
-        }
-    }
-
     void
     ComponentServer_Task::configure_logging_backend (void)
     {
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h
index 443a4b94dd5..8e05789d0e6 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h
@@ -46,10 +46,6 @@ namespace CIAO
 
       void usage (void);
 
-      const char * sched_policy_name (int sched_policy);
-
-      void check_supported_priorities (void);
-
       CORBA::ORB_var orb_;
 
       auto_ptr<CIAO::Logger_Service> logger_;
diff --git a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
index 6b561428001..cdd5336f482 100644
--- a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
+++ b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
@@ -111,7 +111,7 @@ namespace CIAO
                                       ACE_Equal_To<ACE_CString>,
                                       ACE_Null_Mutex> CCMNaming_Map;
       CCMNaming_Map naming_map_;
-      
+
       CIAO::Deployment::ComponentInstallation_var ci_;
     };
   }