diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-15 10:39:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-15 10:39:11 +0000 |
| commit | 40ba01b81978f8a16f594c220a7da97219cf8abd (patch) | |
| tree | ba1ee4953a21dee3e4c763ed79464810be03d003 /CIAO/ciao | |
| parent | ac5e9cbc0c2b7652a97fa4854c005493696c2af0 (diff) | |
| download | ATCD-40ba01b81978f8a16f594c220a7da97219cf8abd.tar.gz | |
Fri Jun 15 10:38:39 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Deployment/Handlers/Container_Handler.cpp:
Zapped some code for extension container
Diffstat (limited to 'CIAO/ciao')
| -rw-r--r-- | CIAO/ciao/Deployment/Handlers/Container_Handler.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp index 7072ea3a262..82617308daa 100644 --- a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp @@ -4,11 +4,7 @@ #include "ciao/Logger/Log_Macros.h" #include "ciao/Logger/Logger_Service.h" #include "ciao/Base/CIAO_PropertiesC.h" -#ifdef DANCE_DEPLOYS_EXTENSION_CONTAINER - #include "ciao/Containers/Extension/Extension_Container.h" -#else - #include "ciao/Containers/Session/Session_Container.h" -#endif +#include "ciao/Containers/Session/Session_Container.h" #include "ciao/Base/Server_init.h" #include "dance/DAnCE_Utility.h" #include "dance/DAnCE_PropertiesC.h" @@ -95,18 +91,6 @@ namespace CIAO CORBA::NO_MEMORY ()); const char *name (plan.instance[instanceRef].name.in ()); -#ifdef DANCE_DEPLOYS_EXTENSION_CONTAINER - CIAO::Extension_Container *cont (0); - - CIAO_DEBUG (6, (LM_DEBUG, CLINFO - "Container_Handler_i::install_instance - " - "Creating extension container with id <%C>\n", - name)); - ACE_NEW_THROW_EX (cont, - CIAO::Extension_Container_i (this->orb_, - this->poa_), - CORBA::NO_MEMORY ()); -#else CIAO::Session_Container *cont (0); CIAO_DEBUG (6, (LM_DEBUG, CLINFO @@ -117,7 +101,6 @@ namespace CIAO CIAO::Session_Container_i (this->orb_, this->poa_), CORBA::NO_MEMORY ()); -#endif CIAO::Container_var container_ref (cont); |