diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-14 11:57:23 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-14 11:57:23 +0000 |
| commit | bcccda2dd19b3f507af4fe95cf0f88fc3fe8c438 (patch) | |
| tree | df99aec64a80eae41d5a357536ab31dce8bd7696 | |
| parent | 24918c102576daeb4b322e42cec71c76fec3def1 (diff) | |
| download | ATCD-bcccda2dd19b3f507af4fe95cf0f88fc3fe8c438.tar.gz | |
Thu Apr 14 11:56:09 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/dds4ccm.mpb:
* MPC/config/dds4ccm_ts_default.mpb:
* connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl:
Extended portability
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/MPC/config/dds4ccm.mpb | 11 | ||||
| -rw-r--r-- | CIAO/MPC/config/dds4ccm_ts_default.mpb | 17 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl | 1 |
4 files changed, 33 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index e692408a870..4c98a24a362 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Apr 14 11:56:09 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * MPC/config/dds4ccm.mpb: + * MPC/config/dds4ccm_ts_default.mpb: + * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl: + Extended portability + Thu Apr 14 10:01:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * MPC/config/dds4ccm_impl.mpb: diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb index 4ef461ec9dc..acbd6bee67b 100644 --- a/CIAO/MPC/config/dds4ccm.mpb +++ b/CIAO/MPC/config/dds4ccm.mpb @@ -20,9 +20,18 @@ feature(dds4ccm_splice) : taoidldefaults { includes += $(CIAO_ROOT)/connectors/dds4ccm/idl } +feature(dds4ccm_coredx) : taoidldefaults, taolib { + macros += CIAO_DDS4CCM_COREDX=1 + idlflags += -DCIAO_DDS4CCM_COREDX=1 \ + -Wb,dds_impl=coredx \ + -I $(CIAO_ROOT)/connectors \ + -I $(CIAO_ROOT)/connectors/dds4ccm/idl + includes += $(CIAO_ROOT)/connectors/dds4ccm/idl +} + feature(dds4ccm_ndds) : ndds_idltocpp_stub { } -feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) { +feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice, !dds4ccm_coredx) { requires += dummy_label } diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb index 86d91e7c04b..efd6e8f8be6 100644 --- a/CIAO/MPC/config/dds4ccm_ts_default.mpb +++ b/CIAO/MPC/config/dds4ccm_ts_default.mpb @@ -11,7 +11,12 @@ feature(dds4ccm_opendds) : dds4ccm, dcps_ts_defaults, dcps, typecode { feature(dds4ccm_splice) : dds4ccm, splice_ts_defaults { Define_Custom(DDSGenerator) : SpliceTypeSupport { -// keyword splice_ts_flags = commandflags + keyword dds_ts_flags = commandflags + } +} + +feature(dds4ccm_coredx) : dds4ccm, coredx_ts_defaults, coredxlib { + Define_Custom(DDSGenerator) : CoreDXTypeSupport { keyword dds_ts_flags = commandflags } } @@ -43,7 +48,15 @@ feature(!dds4ccm_splice) { } } -feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) : typecode { +feature(!dds4ccm_coredx) { + // this allows the user's project to reference coredx_ts_flags, + // which will simply be ignored + Define_Custom(CoreDXDummyTypeSupport) { + keyword coredx_ts_flags + } +} + +feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice, !dds4ccm_coredx) : typecode { Define_Custom(DDSGenerator) { keyword dds_ts_flags } diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl index 1b0dc464d6d..309020ded93 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl @@ -10,6 +10,7 @@ #pragma ndds typesupport "Base/Quoter_BaseSupport.h" #pragma opendds typesupport "Base/Quoter_BaseTypeSupportC.h" +#pragma coredx typesupport "Base/Quoter_BaseTypeSupport.hh" #pragma DCPS_DATA_TYPE "Quoter::Stock_Info" #pragma DCPS_DATA_KEY "Quoter::Stock_Info symbol" |