diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-18 14:16:10 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-18 14:16:10 +0000 |
| commit | a86b7d14d1f6189aa79a1dbe13e44ef3eaafc379 (patch) | |
| tree | 5c27b0dcfb010416cc61d620d5ea14300deb4282 | |
| parent | f512116b9c2e5139e1c738e729bb01e605901d7f (diff) | |
| download | ATCD-a86b7d14d1f6189aa79a1dbe13e44ef3eaafc379.tar.gz | |
Tue Nov 18 14:16:23 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | flat/CIAO/ChangeLog | 14 | ||||
| -rw-r--r-- | flat/CIAO/MPC/config/ciao_context_impl.mpb | 7 | ||||
| -rw-r--r-- | flat/CIAO/MPC/config/ciao_servant.mpb | 8 | ||||
| -rw-r--r-- | flat/CIAO/ciao/Contexts/Context.mpc | 1 | ||||
| -rw-r--r-- | flat/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp | 3 |
5 files changed, 27 insertions, 6 deletions
diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog index 6365651bf60..12f8d7077bf 100644 --- a/flat/CIAO/ChangeLog +++ b/flat/CIAO/ChangeLog @@ -1,3 +1,17 @@ +Tue Nov 18 14:16:23 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/Contexts/Context.mpc: + Added missing dynamicflags + + * ciao/Servants/Servant_Impl_Utils_T.cpp: + Layout change + + * MPC/config/ciao_context_impl.mpb: + New base project + + * MPC/config/ciao_servant.mpb: + Use ciao_context_impl + Mon Nov 17 16:08:23 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * CCF/CCF/IDL2/Parser.hpp: diff --git a/flat/CIAO/MPC/config/ciao_context_impl.mpb b/flat/CIAO/MPC/config/ciao_context_impl.mpb new file mode 100644 index 00000000000..1514876a1d0 --- /dev/null +++ b/flat/CIAO/MPC/config/ciao_context_impl.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ccm_svnt, ciao_container_base, portableserver { + after += CIAO_Context_Impl + libs += CIAO_Context_Impl +} diff --git a/flat/CIAO/MPC/config/ciao_servant.mpb b/flat/CIAO/MPC/config/ciao_servant.mpb index 85238375318..4dc7f0263d6 100644 --- a/flat/CIAO/MPC/config/ciao_servant.mpb +++ b/flat/CIAO/MPC/config/ciao_servant.mpb @@ -1,5 +1,5 @@ //$Id$ -project : ciao_port_activator_stub, ciao_servant_activator, ccm_svnt, ciaocidldefaults, taoidldefaults, ciao_container_base, portableserver, ccm_cookie { - after += CIAO_Servant_Impl CIAO_Context_Impl - libs += CIAO_Servant_Impl CIAO_Context_Impl -}
\ No newline at end of file +project : ciao_port_activator_stub, ciao_servant_activator, ccm_svnt, ciaocidldefaults, taoidldefaults, ciao_container_base, portableserver, ccm_cookie, ciao_context_impl { + after += CIAO_Servant_Impl + libs += CIAO_Servant_Impl +} diff --git a/flat/CIAO/ciao/Contexts/Context.mpc b/flat/CIAO/ciao/Contexts/Context.mpc index 5fb1a62da0d..9c9de111467 100644 --- a/flat/CIAO/ciao/Contexts/Context.mpc +++ b/flat/CIAO/ciao/Contexts/Context.mpc @@ -1,4 +1,5 @@ project(CIAO_Context_Impl) : ccm_svnt, ciao_container_base, portableserver { + dynamicflags = CONTEXT_IMPL_BUILD_DLL Source_Files { Context_Impl_Base.cpp Context_Impl_T.cpp diff --git a/flat/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp b/flat/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp index c798c385e46..a4b03e1a239 100644 --- a/flat/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp +++ b/flat/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp @@ -160,8 +160,7 @@ namespace CIAO const char *port_type_repo_id, T_var &consumer_ref, ::Components::EmitterDescriptions_var &descriptions, - CORBA::ULong slot - ) + CORBA::ULong slot) { CIAO_TRACE ("Servant_Impl_Base::describe_emit_event_source"); ::Components::EmitterDescription *elem = 0; |