diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-08-08 08:39:00 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-08-08 08:39:00 +0000 |
| commit | dbecc8577b660d1920da7848e98019385e7da834 (patch) | |
| tree | 82bda56452af4bc23938fb3335757c777761e39f | |
| parent | 933e99891cacf6f04242300ad07e03ddc6495616 (diff) | |
| download | ATCD-dbecc8577b660d1920da7848e98019385e7da834.tar.gz | |
Mon Aug 8 08:35:38 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/ndds_idltocpp.mpb:
Don't generate arg traits, not needed for datatypes that are only
are intended to go through local interfaces
* connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
Add include open OpenSplice
| -rw-r--r-- | CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | CIAO/MPC/config/ndds_idltocpp.mpb | 3 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 0a817064512..76af395c89e 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Aug 8 08:35:38 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * MPC/config/ndds_idltocpp.mpb: + Don't generate arg traits, not needed for datatypes that are only + are intended to go through local interfaces + + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: + Add include open OpenSplice + Fri Jul 29 14:17:56 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com> * ciao/Containers/Container_Base_T.cpp: diff --git a/CIAO/MPC/config/ndds_idltocpp.mpb b/CIAO/MPC/config/ndds_idltocpp.mpb index c5b0176487b..d07af4e9a2a 100644 --- a/CIAO/MPC/config/ndds_idltocpp.mpb +++ b/CIAO/MPC/config/ndds_idltocpp.mpb @@ -8,7 +8,8 @@ project : nddslib, nddsmonitor, taoidldefaults, taolib { -Wb,dds_impl=ndds \ -I $(CIAO_ROOT)/connectors \ -I $(CIAO_ROOT)/connectors/dds4ccm/idl \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds + -I $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds \ + -Sat includes += $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds \ $(CIAO_ROOT)/connectors \ $(CIAO_ROOT)/connectors/dds4ccm/idl diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl index 98463bb4dbb..5059695f65e 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl +++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl @@ -11,4 +11,8 @@ # include "connectors/dds4ccm/idl/ndds/ndds_dcps.idl" #endif +#if (CIAO_DDS4CCM_SPLICE==1) +# include "dds_dcps.idl" +#endif + #endif |