Tue Aug 26 16:59:49 2003 Nanbor Wang <nanbor@cs.wustl.edu>

6 files changed, 23 insertions, 9 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 5c6d55714b8..6596928f647 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Aug 26 16:59:49 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tools/RTComponentServer/RTConfig_Manager.cpp:
+	* tools/RTComponentServer/RTConfig_Manager.inl:
+	* tools/RTComponentServer/RTServer_Impl.cpp:
+	* tools/RTComponentServer/RTServer_Impl.h:
+	* tools/XML_Helpers/RTConfig_Handlers.cpp: Fixed compilation
+	  problem on Linux.  
+
 Tue Aug 26 10:14:03 2003  Diego Sevilla  <dsevilla@ditec.um.es>
 
 	* CIDLC/ServantSourceGenerator.cpp: Correctly generate get and set
diff --git a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
index 45046e02741..60892392d38 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
@@ -252,7 +252,7 @@ CIAO::RTPolicy_Set_Manager::create_single_policy
 
     case RTCORBA::THREADPOOL_POLICY_TYPE:
       {
-        char *idref;
+        const char *idref;
         policy_config.configuration >>= idref;
         RTCORBA::ThreadpoolId tpid =
           this->resource_manager_.find_threadpool_by_name (idref
@@ -267,7 +267,7 @@ CIAO::RTPolicy_Set_Manager::create_single_policy
 
     case RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE:
       {
-        char *idref;
+        const char *idref;
         policy_config.configuration >>= idref;
         RTCORBA::PriorityBands_var bands =
           this->resource_manager_.find_priority_bands_by_name (idref
diff --git a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.inl b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.inl
index f4d84c022e1..c5bd1c58a8d 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.inl
+++ b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.inl
@@ -23,6 +23,7 @@ CIAO::RTPolicy_Set_Manager::RTPolicy_Set_Manager
 {
 }
 
+ACE_INLINE
 CIAO::RTPolicy_Set_Manager::~RTPolicy_Set_Manager ()
 {
 }
diff --git a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp
index fb427b4e9be..229f7dd95ae 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp
@@ -13,7 +13,8 @@ CIAO::RTServer::RTComponentServer_Impl::~RTComponentServer_Impl ()
 int
 CIAO::RTServer::RTComponentServer_Impl::init (Components::ConfigValues &options
                                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::InvalidConfiguration))
 {
   // @@ Initialize ComponentServer and create the internal container
   // implementation that actually interacts with installed
@@ -144,7 +145,8 @@ int
 CIAO::RTServer::RTContainer_Impl::init (const Components::ConfigValues &options,
                                         Components::Deployment::ComponentInstallation_ptr inst
                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::InvalidConfiguration))
 {
   ACE_DEBUG ((LM_DEBUG, "RTContainer_Impl::init\n"));
 
@@ -190,7 +192,7 @@ parse_container_config_values (const Components::ConfigValues &options
 
       if (ACE_OS::strcmp (options[i]->name (), "CIAO-RTPolicySet") == 0)
         {
-          char *ps_name;
+          const char *ps_name;
           if (options[i]->value () >>= ps_name)
             {
               ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.h b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.h
index 559c02e7ed7..3d545238505 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.h
+++ b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.h
@@ -80,7 +80,8 @@ namespace CIAO
     protected:
       void parse_server_config_values (const Components::ConfigValues &options
                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         Components::InvalidConfiguration));
 
       // Real-time resource manager
       CIAO::RTResource_Config_Manager resource_manager_;
@@ -112,7 +113,8 @@ namespace CIAO
       int init (const Components::ConfigValues &options,
                 Components::Deployment::ComponentInstallation_ptr installation
                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         Components::InvalidConfiguration));
 
     protected:
       void parse_container_config_values (const Components::ConfigValues &options
diff --git a/TAO/CIAO/tools/XML_Helpers/RTConfig_Handlers.cpp b/TAO/CIAO/tools/XML_Helpers/RTConfig_Handlers.cpp
index b89a46c326b..af47ae6744a 100644
--- a/TAO/CIAO/tools/XML_Helpers/RTConfig_Handlers.cpp
+++ b/TAO/CIAO/tools/XML_Helpers/RTConfig_Handlers.cpp
@@ -7,8 +7,8 @@
 #endif /* __ACE_INLINE__ */
 
 void
-CIAO::RTConfig_Handler::startElement (const ACEXML_Char *namespaceURI,
-                                      const ACEXML_Char *localName,
+CIAO::RTConfig_Handler::startElement (const ACEXML_Char *,
+                                      const ACEXML_Char *,
                                       const ACEXML_Char *qName,
                                       ACEXML_Attributes *alist
                                       ACEXML_ENV_ARG_DECL)