From 7c08c28808b44ae159acf0fbbb82177cc5e51d25 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 6 Oct 2005 07:59:57 +0000 Subject: ChangeLogTag: Wed Oct 5 13:00:12 UTC 2005 Johnny Willemsen --- .../DomainApplicationManager/Deployment_Configuration.cpp | 12 ++++++------ TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp index 52de02031e0..3906513bb9f 100644 --- a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp +++ b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp @@ -23,8 +23,8 @@ CIAO::Deployment_Configuration::init (const char *filename) if (filename == 0) { - ACE_ERROR ((LM_ERROR, "CIAO (%P|%t) Deployment_Configuration.cpp - : Unable to identify the file name \n")); + ACE_ERROR ((LM_ERROR, "CIAO (%P|%t) Deployment_Configuration.cpp" + ": Unable to identify the file name \n")); return -1; } @@ -33,10 +33,10 @@ CIAO::Deployment_Configuration::init (const char *filename) if (inf == NULL) { ACE_ERROR_RETURN ((LM_ERROR, - "CIAO (%P|%t) Deployment_Configuration.cpp: - Fail to open node manager map data file: %s : \n", - filename), - -1); + "CIAO (%P|%t) Deployment_Configuration.cpp:" + "Fail to open node manager map data file: %s : \n", + filename), + -1); } char destination[NAME_BUFSIZE], ior[NAME_BUFSIZE]; diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp index 26bc7d743f2..64e80583806 100644 --- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp +++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp @@ -40,8 +40,8 @@ namespace CIAO if (CIAO::debug_level () > 10) ACE_DEBUG ((LM_DEBUG, - "CIAO (%P|%t) Domain Application Manager - invoked CIAO_Execution_Manager: preparePlan \n")); + "CIAO (%P|%t) Domain Application Manager " + "invoked CIAO_Execution_Manager: preparePlan \n")); // There is a Domain Application Manager already existing // for this DeploymentPlan. @@ -107,7 +107,7 @@ namespace CIAO dam_servant->_this (); /// @@ TODO:Need to check the return value...... - /// + /// this->map_.bind_dam_reference ( plan.UUID.in (), Deployment::DomainApplicationManager::_duplicate (dam.in ())); -- cgit v1.2.1