Friday Sep 30 15:12:43 2005 William Otte <wotte@dre.vanderbilt.edu>

7 files changed, 17 insertions, 6 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index e7510ff5180..4b406e9bfcc 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Friday Sep 30 15:12:43 2005  William Otte <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+        * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
+        * RACE/Planner_Manager/Component/Planner_Manager.mpc
+        * tests/IDL3/ImpliedIDL/All/all.mpc
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+
+        Fixes for compile problems in Borland6
+        
 Fri Sep 30 15:11:47 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
 
 	* NEWS
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
index 2757204c287..098848f2edf 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 project (DomainApplicationManager): ciao_deployment_svnt, ciao_config_handlers  {
-
+  after += NodeManager_stub 
   sharedname = DomainApplicationManager
 
   dynamicflags   = DOMAINAPPLICATIONMANAGER_BUILD_DLL
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc b/TAO/CIAO/DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
index cb38cebc333..1615ae4b98d 100644
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
@@ -29,7 +29,7 @@ project (spec_RepositoryManager) : ciao_server_dnc, taoexe, ciao_config_handlers
 
 // RMadmin project: a sample client for the RM.
 
-project (spec_RMAdmin) : ciao_client_dnc, ciao_config_handlers {
+project (spec_RMAdmin) : ciao_server_dnc, ciao_config_handlers {
   exename = RMadmin
   after    += spec_RepositoryManager
 
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
index 119cbdec78a..673c8647431 100644
--- a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
@@ -80,7 +80,7 @@ project(Planner_Manager_svnt) : ciao_servant_dnc {
 
 
 project(Planner_Manager_exec) : ciao_component_dnc {
-  after   += Planner_Manager_svnt
+  after   += Planner_Manager_svnt Planner_stub
   sharedname = Planner_Manager_exec
   libs    += Planner_Manager_stub \
              Planner_Manager_svnt \
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
index 1234f9014dc..e91274525a4 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(ConvertIDL3) : taoidl3toidl2defaults, ciao_server_dnc {
+project(ConvertIDL3) : taoidl3toidl2defaults, ciao_component_dnc {
   idlflags += -Sc -Sm
   
   IDL3TOIDL2_Files {
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
index b50e1915be8..a5963f27695 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
@@ -4903,7 +4903,7 @@ namespace CIAO
       void Priority::
       traverse (Type const& o)
       {
-        ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >::traverse (o);
+        ::XMLSchema::Writer::FundamentalType< ::CIAO::Config_Handlers::Priority, ACE_TCHAR >::traverse (o);
         Traversal::Priority::traverse (o);
       }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
index cfa0314b1aa..f7542f5542d 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
@@ -1985,7 +1985,7 @@ namespace CIAO
       };
 
       struct  Priority : Traversal::Priority, 
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::CIAO::Config_Handlers::Priority, ACE_TCHAR >,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Priority Type;