diff options
Diffstat (limited to 'TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h')
-rw-r--r-- | TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h index 33f15ba0362..253a1f7e767 100644 --- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h +++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h @@ -17,8 +17,6 @@ #include "ace/Hash_Map_Manager.h" #include "ciao/DeploymentC.h" #include "ace/SString.h" -#include "CIAO_NAM_Export.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -32,33 +30,16 @@ namespace CIAO * This is a helper class to populate the NodeImplementationInfo struct from * a deployment plan.. */ - class CIAO_NAM_Export Containers_Info_Map + class Containers_Info_Map { public: - Containers_Info_Map (const Deployment::DeploymentPlan & plan, - const Deployment::ComponentPlans & shared_components); + Containers_Info_Map (const Deployment::DeploymentPlan & plan); Deployment::ContainerImplementationInfos * containers_info (void); private: - void initialize_map (void); - bool build_map (void); - - bool insert_instance_into_map ( - const Deployment::InstanceDeploymentDescription & instance); - - bool insert_instance_into_container ( - const Deployment::InstanceDeploymentDescription & instance, - Deployment::ComponentImplementationInfos & impl_infos); - - /// Helper function to check wheather a component instance - /// is in the "shared components list". - bool is_shared_component (ACE_CString & name); - - //Deployment::ContainerImplementationInfos_var containers_info_; - typedef ACE_Hash_Map_Manager_Ex <ACE_CString, Deployment::ContainerImplementationInfo *, @@ -67,13 +48,24 @@ namespace CIAO ACE_Null_Mutex> MAP; typedef MAP::iterator Iterator; + MAP map_; const Deployment::DeploymentPlan & plan_; - /// shared components list, passed in from NodeImplementationInfoHandler - /// class. - Deployment::ComponentPlans shared_components_; + //Deployment::ContainerImplementationInfos_var containers_info_; + + private: + + void initialize_map (void); + bool build_map (void); + + bool insert_instance_into_map ( + const Deployment::InstanceDeploymentDescription & instance); + + bool insert_instance_into_container ( + const Deployment::InstanceDeploymentDescription & instance, + Deployment::ComponentImplementationInfos & impl_infos); }; } |