diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-01-31 04:37:24 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-01-31 04:37:24 +0000 |
commit | ee676eff1bb9badbb83bc4b5e51941554231da79 (patch) | |
tree | ed78dbadc2136dd9475f40177d5a684b1d3e790a | |
parent | 8d6c21045c7949746cf3768bdb038ebc8c454956 (diff) | |
download | ATCD-ee676eff1bb9badbb83bc4b5e51941554231da79.tar.gz |
ChangeLogTag:Sun Jan 30 20:30:46 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
4 files changed, 11 insertions, 2 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index f0b4e4c4912..cd0f916f2af 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,9 +1,15 @@ Sun Jan 30 20:30:46 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + * DAnCE/DomainApplicationManager/Deployment_Configuration.h: + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + * DAnCE/ExecutionManager/ExecutionManager_Impl.h: * DAnCE/NodeApplicationManager/ImplementationInfo.cpp: * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: * DAnCE/ciao/Container_Base.cpp: * DAnCE/ciao/NodeApplication_Impl.cpp: + * ciao/Container_Base.cpp: + * ciao/ServerActivator_Impl.h: + * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp: Added missing header include directives that are necessary due to inter-header dependency reductions in ACE. diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h index c1ab5e6ae8c..4c54851e94b 100644 --- a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h +++ b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h @@ -27,6 +27,7 @@ #include "DomainApplicationManager/DomainApplicationManager_Export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" +#include "ace/SString.h" namespace CIAO { diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index a9591a62ee5..483ba0cb483 100644 --- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -1,9 +1,10 @@ // $Id$ #include "DomainApplicationManager_Impl.h" +#include "NodeManager/NodeDaemonC.h" #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" -#include "NodeManager/NodeDaemonC.h" +#include "ace/SString.h" #if !defined (__ACE_INLINE__) # include "DomainApplicationManager_Impl.inl" @@ -579,7 +580,7 @@ destroyManager (ACE_ENV_SINGLE_ARG_DECL) ::Deployment::NodeManager_var my_node_manager = (entry->int_id_).node_manager_; - + // Since we have the first arg is not used by NM anyway. my_node_manager->destroyManager (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h index 1d009de77a6..306a1776971 100644 --- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h +++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h @@ -23,6 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Synch.h" +#include "ace/SString.h" #include "ace/Hash_Map_Manager.h" #include "tao/Utils/Servant_Var.h" #include "DomainApplicationManager/DomainApplicationManager_Impl.h" |