diff options
| author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-10-27 07:20:03 +0000 |
|---|---|---|
| committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-10-27 07:20:03 +0000 |
| commit | 0b3dc7d7ab7e7861c17cb40fc2f2503de815d853 (patch) | |
| tree | 33d326159528daa0e41d02e1c58e35f7ecdb3221 | |
| parent | c1825ee60b2640d92230857cf72aa30e19476af4 (diff) | |
| download | ATCD-0b3dc7d7ab7e7861c17cb40fc2f2503de815d853.tar.gz | |
Tue Oct 27 07:16:24 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* ciao/Containers/Extension/Extension_Containers.mpc:
Remove ciao_port_activator_stub and cia_servant_activator_stub
* ciao/Servants/Servant_Impl_Base.cpp:
Committed the right file now.
| -rw-r--r-- | CIAO/ChangeLog.BRANCH | 13 | ||||
| -rw-r--r-- | CIAO/ciao/Containers/Extension/Extension_Container.mpc | 5 | ||||
| -rw-r--r-- | CIAO/ciao/Servants/Servant_Impl_Base.cpp | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH index 1220df77dee..6d56ee6423c 100644 --- a/CIAO/ChangeLog.BRANCH +++ b/CIAO/ChangeLog.BRANCH @@ -1,15 +1,22 @@ -Wed Oct 26 12:018:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl> +Tue Oct 27 07:16:24 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * ciao/Containers/Extension/Extension_Containers.mpc: + Remove ciao_port_activator_stub and cia_servant_activator_stub + * ciao/Servants/Servant_Impl_Base.cpp: + Committed the right file now. + +Wed Oct 26 12:018:24 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * ciao/Containers/Session/Session_Containers.mpc: Remove ciao_port_activator_stub and cia_servant_activator_stub -Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl> +Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * ciao/Containers/Containers.mpc: Remove ciao_port_activator_stub and cia_servant_activator_stub -Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl> +Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * MPC/config/ciao_extension_container.mpb: * MPC/config/ciao_extension_container_stub.mpb: diff --git a/CIAO/ciao/Containers/Extension/Extension_Container.mpc b/CIAO/ciao/Containers/Extension/Extension_Container.mpc index 8aa548c955d..b73ee9e63a5 100644 --- a/CIAO/ciao/Containers/Extension/Extension_Container.mpc +++ b/CIAO/ciao/Containers/Extension/Extension_Container.mpc @@ -17,7 +17,7 @@ project(CIAO_Extension_Container_idl) : install, ciaoidldefaults { } project(CIAO_Extension_Container_stub) : install, ccm_stub, ciao_lib, ciao_container_base_stub, utils, ciao_base, \ - ciao_servant_activator_stub { + { after += CIAO_Extension_Container_idl dynamicflags += EXTENSION_CONTAINER_STUB_BUILD_DLL @@ -37,9 +37,8 @@ project(CIAO_Extension_Container_stub) : install, ccm_stub, ciao_lib, ciao_conta install_dir = ciao/Containers/Extension } } - project(CIAO_Extension_Container) : install, ccm_svnt, ciao_lib, ciao_extension_container_stub, utils, \ - ciao_base, ciao_servant_activator, \ + ciao_base, \ ciao_servant, ccm_extension_stub, portableserver { after += CIAO_Extension_Container_idl dynamicflags += EXTENSION_CONTAINER_BUILD_DLL diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Servant_Impl_Base.cpp index 173aad1f546..f06b7fef3da 100644 --- a/CIAO/ciao/Servants/Servant_Impl_Base.cpp +++ b/CIAO/ciao/Servants/Servant_Impl_Base.cpp @@ -40,9 +40,9 @@ namespace CIAO port_poa->deactivate_object (cons_id); - CIAO::Servant_Activator_var sa = +/* CIAO::Servant_Activator_var sa = cnt_safe->ports_servant_activator (); -/* + if (!CORBA::is_nil (sa.in ())) { sa->update_port_activator (cons_id.in ()); |