diff options
| author | msmit <msmit@remedy.nl> | 2010-07-23 13:59:36 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-07-23 13:59:36 +0000 |
| commit | 3f3640ac4c850c093f6a396dbebe5f3546f597b0 (patch) | |
| tree | d5a875203c564fb2283272b56f3a1d67e2626c55 /CIAO | |
| parent | c6b1186e5d54c5b5ef2721b9781550f3ed837366 (diff) | |
| download | ATCD-3f3640ac4c850c093f6a396dbebe5f3546f597b0.tar.gz | |
Fri Jul 23 13:55:56 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl:
* connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
* connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
Replace an anonymous bounded octet sequence with a typedef.
Diffstat (limited to 'CIAO')
4 files changed, 16 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 00e6bc55c55..f3c78507bf7 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 23 13:55:56 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl: + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: + Replace an anonymous bounded octet sequence with a typedef. + Fri Jul 23 13:56:23 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl index 713629c37f7..2fda9a3d1f8 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl @@ -6,12 +6,12 @@ //#pragma ndds typesupport "Base/Latency_BaseSupport.h" const short MAX_DATA_SEQUENCE_LENGTH = 8192; - +typedef sequence<octet, MAX_DATA_SEQUENCE_LENGTH> octet_sequence; //#pragma DCPS_DATA_TYPE "Latency" struct LatencyTest { long seq_num; - sequence<octet, MAX_DATA_SEQUENCE_LENGTH> data; + octet_sequence data; }; //typedef sequence<LatencyTest> LatencyTest_Seq; diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl index 350a1128822..2c998e5f8f8 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl @@ -10,6 +10,8 @@ #pragma ndds typesupport "Base/VTopic_BaseSupport.h" +typedef octet octet_array[5]; + // Plain topic struct TestTopic { string key; //@key @@ -25,7 +27,7 @@ struct TopicString { // Arrays struct TopicArray { string key; //@key - octet x_array[5]; + octet_array x_array; }; // Unions diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl index 60cb838f004..8864a9030e5 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl @@ -10,6 +10,9 @@ #pragma ndds typesupport "Base/VTopics_BaseSupport.h" +typedef octet octet_array[5]; + + // Plain Topic struct TestTopic { string key; //@key @@ -25,7 +28,7 @@ struct TopicString { // Arrays struct TopicArray { string key; //@key - octet x_array[5]; + octet_array x_array; }; // Unions |