diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-21 19:23:31 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-21 19:23:31 +0000 |
| commit | 223600028b74ac5702c558ff129a67c7f1eddd1a (patch) | |
| tree | 1256d61b2b265dead4f43e09dbbfc74ecb6b87f9 | |
| parent | 68cb5f2ae935ef43209ca5da0a66565b64bae8ba (diff) | |
| download | ATCD-223600028b74ac5702c558ff129a67c7f1eddd1a.tar.gz | |
Tue Oct 21 19:23:20 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | flat/CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog index 29837c4af08..291fc8e358c 100644 --- a/flat/CIAO/ChangeLog +++ b/flat/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 21 19:23:20 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/DomainApplication/Domain_Application_Impl.h: + Added missing post.h + Tue Oct 21 18:51:20 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ccm/CCM.mpc: diff --git a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h index 954087133cf..651c41838ad 100644 --- a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h +++ b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h @@ -40,15 +40,15 @@ namespace DAnCE { public: // typedef ACE_Vector<Deployment::NodeApplication_var> TApplications; - typedef ACE_Map_Manager < Deployment::NodeApplicationManager_var, - Deployment::NodeManager_var, + typedef ACE_Map_Manager < Deployment::NodeApplicationManager_var, + Deployment::NodeManager_var, ACE_Null_Mutex > TNam2Nm; - typedef ACE_Map_Manager < Deployment::Application_var, - Deployment::NodeApplicationManager_var, + typedef ACE_Map_Manager < Deployment::Application_var, + Deployment::NodeApplicationManager_var, ACE_Null_Mutex > TApp2Mgr; - DomainApplication_Impl (TNam2Nm& nams, - const Deployment::Properties & configProperty, + DomainApplication_Impl (TNam2Nm& nams, + const Deployment::Properties & configProperty, Deployment::Connections& conn); ~DomainApplication_Impl(); @@ -75,6 +75,8 @@ namespace DAnCE void startLaunch (const Deployment::Properties & configProperty); }; }; // DAnCE + +#include /**/ "ace/post.h" #endif // DOMAIN_APPLICATION_H |