diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-04-08 09:55:45 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-04-08 09:55:45 +0000 |
| commit | 9b2c2bacc762c81ab2dfe0ed06f8656ac8dc107b (patch) | |
| tree | 9d70d44e49174788469665dc6d7bdc2770e03498 | |
| parent | 241041183f276c5520b99442a12baf7f6b46bc66 (diff) | |
| download | ATCD-9b2c2bacc762c81ab2dfe0ed06f8656ac8dc107b.tar.gz | |
Thu Apr 8 09:56:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/ccm_lw.mpb:
Added -Gcl
* ciao/Servants/Servant_Impl_T.cpp:
Fix for LwCCM
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/MPC/config/ccm_lw.mpb | 2 | ||||
| -rw-r--r-- | CIAO/ciao/Servants/Servant_Impl_T.cpp | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 7ba8cc446a1..2513d1669b4 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Apr 8 09:56:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * MPC/config/ccm_lw.mpb: + Added -Gcl + + * ciao/Servants/Servant_Impl_T.cpp: + Fix for LwCCM + Thu Apr 8 08:47:45 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/docs/TestCoverage.ods: diff --git a/CIAO/MPC/config/ccm_lw.mpb b/CIAO/MPC/config/ccm_lw.mpb index 5d66fec471a..188f2023103 100644 --- a/CIAO/MPC/config/ccm_lw.mpb +++ b/CIAO/MPC/config/ccm_lw.mpb @@ -3,5 +3,5 @@ feature (ccm_lw) : taobaseidldefaults { macros += CCM_LW - idlflags += -DCCM_LW + idlflags += -DCCM_LW -Gcl } diff --git a/CIAO/ciao/Servants/Servant_Impl_T.cpp b/CIAO/ciao/Servants/Servant_Impl_T.cpp index e9f99ef7cdd..66901a92bf0 100644 --- a/CIAO/ciao/Servants/Servant_Impl_T.cpp +++ b/CIAO/ciao/Servants/Servant_Impl_T.cpp @@ -123,6 +123,7 @@ namespace CIAO return sc->get_CCM_object (); } +#if !defined (CCM_LW) ::Components::EntityContext_var ec = ::Components::EntityContext::_narrow (this->context_); @@ -130,6 +131,7 @@ namespace CIAO { return ec->get_CCM_object (); } +#endif throw CORBA::INTERNAL (); } |