summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-12-03 09:22:52 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-12-03 09:22:52 +0000
commit15e6f67bc858316b7cb0b8fd6c7cf17a522de11b (patch)
tree9073a1960f505f658983a888552f4c9c668fa2e5
parent27392a7e17d78623b618f39126a2c967630028d3 (diff)
downloadATCD-15e6f67bc858316b7cb0b8fd6c7cf17a522de11b.tar.gz
Fri Dec 3 10:21:40 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/dds4ccm.mpb: * MPC/config/dds4ccm_ts_default.mpb: Added flags for OpenDDS
-rw-r--r--CIAO/ChangeLog6
-rw-r--r--CIAO/MPC/config/dds4ccm.mpb1
-rw-r--r--CIAO/MPC/config/dds4ccm_ts_default.mpb1
3 files changed, 8 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 89b4f1725eb..b72f0a3be2e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 3 10:21:40 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * MPC/config/dds4ccm.mpb:
+ * MPC/config/dds4ccm_ts_default.mpb:
+ Added flags for OpenDDS
+
Fri Dec 3 09:36:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/ami4ccm/tests/IDL_Test/Hello_Component.idl:
diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb
index c4cd234f0e1..eaf3dff0db1 100644
--- a/CIAO/MPC/config/dds4ccm.mpb
+++ b/CIAO/MPC/config/dds4ccm.mpb
@@ -5,6 +5,7 @@ feature(dds4ccm_opendds) : taoidldefaults, dcps {
macros += CIAO_DDS4CCM_OPENDDS=1
idlflags += -DCIAO_DDS4CCM_OPENDDS=1 \
-Wb,dds_impl=opendds \
+ -Wb,opendds_sequence_suffix=DDSSeq \
-I $(CIAO_ROOT)/connectors \
-I $(CIAO_ROOT)/connectors/dds4ccm/idl
includes += $(CIAO_ROOT)/connectors/dds4ccm/idl
diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb
index 6819825ad95..3f91c951d2b 100644
--- a/CIAO/MPC/config/dds4ccm_ts_default.mpb
+++ b/CIAO/MPC/config/dds4ccm_ts_default.mpb
@@ -3,6 +3,7 @@
feature(dds4ccm_opendds) : dds4ccm, dcps_ts_defaults, dcps {
Define_Custom(DDSGenerator) : TypeSupport {
+ commandflags += -Wb,opendds_sequence_suffix=DDSSeq
keyword opendds_ts_flags = commandflags
keyword dds_ts_flags = commandflags
}