From b1d837081c5153a7b0d08f022f31b64ee2e6e67e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 10 Oct 2006 14:24:11 +0000 Subject: Tue Oct 10 14:16:12 2006 Johnny Willemsen --- CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp | 2 +- CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h | 4 +--- CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp | 3 ++- CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h | 9 +++------ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp index addf776ff03..1129a3a822c 100644 --- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp @@ -174,7 +174,7 @@ namespace CIAO if (j == this->plan_.infoProperty.length ()) { // No Server Resource Def found?! Inconsistent descriptor files. - ACE_DEBUG ((LM_ERROR, "(%P|%t) Descriptor error: " + ACE_ERROR ((LM_ERROR, "(%P|%t) Descriptor error: " "No matching server resource def found for component: %s!\n", this->plan_.instance[i].name.in ())); } diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h index a60cbe662b3..076ee8a6511 100644 --- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h +++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h @@ -87,7 +87,7 @@ namespace CIAO * any references to HTTP URLs */ protected: - + // @Stoyan - Please follow ACE coding guideines when naming your //member variables. In particular, please use lower case and //follow the name with a trailing underscore. @@ -102,7 +102,6 @@ namespace CIAO /// This function resolves any http location references /// in the name of the implementation artifacts /// It returns true on success and false on failure - bool resolve_http_reference (const char* location, ACE_CString &name); @@ -111,7 +110,6 @@ namespace CIAO /// stores the file in the passed preallocated ACE_Message_Block /// returns 1 on success /// 0 on error - bool retrieve_via_HTTP (const char* URL, ACE_Message_Block &mb); diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp index f4c5e84a1bc..436715588c4 100644 --- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp @@ -83,8 +83,9 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void) void CIAO::NodeImplementationInfoHandler::populate_container_impl_infos (void) { - CORBA::ULong curr_len = + CORBA::ULong const curr_len = this->containers_info_map_.containers_info ()->length (); + ACE_UNUSED_ARG (curr_len); // assignment operation diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h index 475802f3d1a..de6fc2d8cab 100644 --- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h +++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.h @@ -3,7 +3,7 @@ /*************************************************************** * @file ImplementationInfo.h * - * @brief This file defines some helper functions for paring the + * @brief This file defines some helper functions for preparing the * Component ImplementationInfo and properties from * the plan. * @@ -27,13 +27,10 @@ #include "Containers_Info_Map.h" #include "CIAO_NAM_Export.h" -//@@ I wish we could have precompiled header support soon!!! - -// This method is a helper function to parse the local deployment plan into the -// NodeImplementationInfo struct. - namespace CIAO { + /// This class is a helper class to parse the local deployment plan into the + /// NodeImplementationInfo struct. class CIAO_NAM_Export NodeImplementationInfoHandler { public: -- cgit v1.2.1