summaryrefslogtreecommitdiff
path: root/CIAO/connectors/dds4ccm/tests/VariousTopicsState
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-03-18 08:02:24 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-03-18 08:02:24 +0000
commitcbb22ee89b8403087143be93cd89f5a39b8de0ef (patch)
tree905ad276a3d835be59bdc39ec7f0edd653a3deac /CIAO/connectors/dds4ccm/tests/VariousTopicsState
parent0f2d105d94a59998764a9fefb455d4684a5b4ce1 (diff)
downloadATCD-cbb22ee89b8403087143be93cd89f5a39b8de0ef.tar.gz
Thu Mar 18 07:59:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.cpp * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.idl * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h * connectors/dds4ccm/performance-tests/LatencyTT/Base/LatencyTT_Test_Base.idl * connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.idl * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.cpp * connectors/dds4ccm/performance-tests/LatencyTT/Receiver/LatencyTT_Test_Receiver_exec.h * connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.idl * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.h * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h * connectors/dds4ccm/tests/NoModule/NoModule.idl * connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc Use Seq as postfix for the dds4ccm user sequences instead of _Seq * MPC/config/dds4ccm_ts_default.mpb: Use the new rtiddsgen 4.5 features to only show errors and the RTI DDS sequences now get a RTISeq postfix
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/VariousTopicsState')
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl12
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl8
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc76
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc18
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc12
10 files changed, 68 insertions, 68 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
index fdb2c60d64b..4f852e618e3 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
@@ -65,11 +65,11 @@ struct TopicValuetype {
};
// Sequences
-typedef sequence<TestTopic> TestTopic_Seq;
-typedef sequence<TopicString> TopicString_Seq;
-typedef sequence<TopicArray> TopicArray_Seq;
-typedef sequence<TopicUnion> TopicUnion_Seq;
-typedef sequence<TopicSeq> TopicSeq_Seq;
-typedef sequence<TopicValuetype> TopicValuetype_Seq;
+typedef sequence<TestTopic> TestTopicSeq;
+typedef sequence<TopicString> TopicStringSeq;
+typedef sequence<TopicArray> TopicArraySeq;
+typedef sequence<TopicUnion> TopicUnionSeq;
+typedef sequence<TopicSeq> TopicSeqSeq;
+typedef sequence<TopicValuetype> TopicValuetypeSeq;
#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
index 7a8433e6726..47160c4f29d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
@@ -16,7 +16,7 @@
module VTopics
{
- module ::CCM_DDS::Typed < ::TopicArray, ::TopicArray_Seq> TopicArrayConn;
+ module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConn;
connector VTS_Array_Connector : TopicArrayConn::DDS_State
{
};
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
index 4d2e815b8a3..e0e30accfda 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
@@ -1,7 +1,7 @@
// $Id$
/**
- * @file VTS_Seq_Connector.idl
+ * @file VTSSeq_Connector.idl
* @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
*/
@@ -12,12 +12,12 @@
#include "Base/VTopics_Base.idl"
#include "connectors/dds4ccm/idl/ccm_dds.idl"
-#pragma ciao lem "Conn_Seq/VTS_Seq_ConnectorE.idl"
+#pragma ciao lem "ConnSeq/VTSSeq_ConnectorE.idl"
module VTopics
{
- module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeq_Seq> TopicSeqConn;
- connector VTS_Seq_Connector : TopicSeqConn::DDS_State
+ module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConn;
+ connector VTSSeq_Connector : TopicSeqConn::DDS_State
{
};
};
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
index d11a8536328..6e0c321b829 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
@@ -1,21 +1,21 @@
// $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Seq_Connector"
+// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTSSeq_Connector"
project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
after += DDS4CCM_idl_gen
custom_only = 1
idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_STUB_Export \
- -Wb,stub_export_include=VTS_Seq_Connector_stub_export.h \
+ -Wb,stub_export_include=VTSSeq_Connector_stub_export.h \
-Wb,skel_export_macro=VTS_SEQ_CONNECTOR_SVNT_Export \
- -Wb,skel_export_include=VTS_Seq_Connector_svnt_export.h \
+ -Wb,skel_export_include=VTSSeq_Connector_svnt_export.h \
-Wb,svnt_export_macro=VTS_SEQ_CONNECTOR_SVNT_Export \
- -Wb,svnt_export_include=VTS_Seq_Connector_svnt_export.h \
+ -Wb,svnt_export_include=VTSSeq_Connector_svnt_export.h \
-Wb,conn_export_macro=VTS_SEQ_CONNECTOR_CONN_Export \
- -Wb,conn_export_include=VTS_Seq_Connector_conn_export.h \
+ -Wb,conn_export_include=VTSSeq_Connector_conn_export.h \
-I ..
IDL_Files {
- VTS_Seq_Connector.idl
+ VTSSeq_Connector.idl
}
}
@@ -23,18 +23,18 @@ project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
custom_only = 1
after += DDS_VTS_SEQ_Connector_idl_gen
idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_LEM_STUB_Export \
- -Wb,stub_export_include=VTS_Seq_Connector_lem_stub_export.h \
+ -Wb,stub_export_include=VTSSeq_Connector_lem_stub_export.h \
-SS -Gxhst \
-I ..
IDL_Files {
- VTS_Seq_ConnectorE.idl
+ VTSSeq_ConnectorE.idl
}
}
project(DDS_VTS_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
- after += DDS_VTS_SEQ_Connector_lem_gen DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub
- libs += DDS_VTopics_Base_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub
+ after += DDS_VTS_SEQ_Connector_lem_gen DDS_VTSSeq_Connector_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub
+ libs += DDS_VTopics_Base_stub DDS_VTSSeq_Connector_stub DDS4CCM_lem_stub
libpaths += ../lib
libout = ../lib
includes += ..
@@ -45,49 +45,49 @@ project(DDS_VTS_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
}
Source_Files {
- VTS_Seq_ConnectorEC.cpp
+ VTSSeq_ConnectorEC.cpp
}
Header_Files {
- VTS_Seq_ConnectorEC.h
- VTS_Seq_Connector_lem_stub_export.h
+ VTSSeq_ConnectorEC.h
+ VTSSeq_Connector_lem_stub_export.h
}
Inline_Files {
- VTS_Seq_ConnectorEC.inl
+ VTSSeq_ConnectorEC.inl
}
}
-project(DDS_VTS_Seq_Connector_stub) : ccm_stub, dds4ccm_base {
+project(DDS_VTSSeq_Connector_stub) : ccm_stub, dds4ccm_base {
after += DDS_VTS_SEQ_Connector_idl_gen DDS_VTopics_Base_stub
libs += DDS_VTopics_Base_stub
libpaths += ../lib
libout = ../lib
includes += ..
- sharedname = DDS_VTS_Seq_Connector_stub
+ sharedname = DDS_VTSSeq_Connector_stub
dynamicflags = VTS_SEQ_CONNECTOR_STUB_BUILD_DLL
IDL_Files {
}
Source_Files {
- VTS_Seq_ConnectorC.cpp
+ VTSSeq_ConnectorC.cpp
}
Header_Files {
- VTS_Seq_ConnectorC.h
- VTS_Seq_Connector_stub_export.h
+ VTSSeq_ConnectorC.h
+ VTSSeq_Connector_stub_export.h
}
Inline_Files {
- VTS_Seq_ConnectorC.inl
+ VTSSeq_ConnectorC.inl
}
}
-project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
- after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
- sharedname = DDS_VTS_Seq_Connector_exec
- libs += DDS_VTS_Seq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+project(DDS_VTSSeq_Connector_exec) : ciao_executor, dds4ccm_impl {
+ after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTSSeq_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+ sharedname = DDS_VTSSeq_Connector_exec
+ libs += DDS_VTSSeq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
libpaths += ../lib
libout = ../lib
includes += ..
@@ -97,12 +97,12 @@ project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
}
Source_Files {
- VTS_Seq_Connector_conn.cpp
+ VTSSeq_Connector_conn.cpp
}
Header_Files {
- VTS_Seq_Connector_conn.h
- VTS_Seq_Connector_conn_export.h
+ VTSSeq_Connector_conn.h
+ VTSSeq_Connector_conn_export.h
}
Inline_Files {
@@ -110,13 +110,13 @@ project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
}
-project(DDS_VTS_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
- after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_exec DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub
- sharedname = DDS_VTS_Seq_Connector_svnt
- libs += DDS_VTS_Seq_Connector_stub \
+project(DDS_VTSSeq_Connector_svnt) : ciao_servant, dds4ccm_impl {
+ after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTSSeq_Connector_exec DDS_VTSSeq_Connector_stub DDS4CCM_lem_stub
+ sharedname = DDS_VTSSeq_Connector_svnt
+ libs += DDS_VTSSeq_Connector_stub \
DDS_VTS_SEQ_Connector_lem_stub \
DDS_VTopics_Base_stub \
- DDS_VTS_Seq_Connector_exec \
+ DDS_VTSSeq_Connector_exec \
DDS4CCM_lem_stub
libpaths += ../lib
libout = ../lib
@@ -127,18 +127,18 @@ project(DDS_VTS_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
}
Source_Files {
- VTS_Seq_ConnectorS.cpp
- VTS_Seq_Connector_svnt.cpp
+ VTSSeq_ConnectorS.cpp
+ VTSSeq_Connector_svnt.cpp
}
Header_Files {
- VTS_Seq_ConnectorS.h
- VTS_Seq_Connector_svnt.h
- VTS_Seq_Connector_svnt_export.h
+ VTSSeq_ConnectorS.h
+ VTSSeq_Connector_svnt.h
+ VTSSeq_Connector_svnt_export.h
}
Inline_Files {
- VTS_Seq_ConnectorS.inl
+ VTSSeq_ConnectorS.inl
}
}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
index d8fcb01c6bf..c3c0736f42d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
@@ -16,7 +16,7 @@
module VTopics
{
- module ::CCM_DDS::Typed < ::TopicString, ::TopicString_Seq> TopicStringConn;
+ module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConn;
connector VTS_String_Connector : TopicStringConn::DDS_Event
{
};
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
index b18e0333989..435b3b84eb9 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
@@ -16,7 +16,7 @@
module VTopic
{
- module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnion_Seq> TopicUnionConn;
+ module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConn;
connector VT_Union_Connector : TopicUnionConn::DDS_State
{
};
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
index 08ec5b321a0..6d61eb185d0 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
@@ -16,7 +16,7 @@
module VTopics
{
- module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetype_Seq> TopicValuetypeConn;
+ module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConn;
connector VTS_Valuetype_Connector : TopicValuetypeConn::DDS_State
{
};
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
index c215b946d6f..cd1748ae3b1 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
@@ -16,7 +16,7 @@
module VTopics
{
- module ::CCM_DDS::Typed < ::TestTopic, ::TestTopic_Seq> TestTopicConn;
+ module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConn;
connector VTopics_Connector : TestTopicConn::DDS_State
{
};
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
index e4e4bdf788f..919dc5883be 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
@@ -32,10 +32,10 @@ project(DDS_VTopics_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
project(DDS_VTopics_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
after += DDS_VTopics_Receiver_lem_gen DDS_VTopics_Receiver_stub DDS_VTopics_Base_stub \
DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
- DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
+ DDS_VTS_Array_Connector_stub DDS_VTSSeq_Connector_stub \
DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub
libs += Receiver_stub DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
- DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub \
+ DDS_VTS_Array_Connector_stub DDS_VTSSeq_Connector_stub DDS_VTopics_Base_stub \
DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub
libpaths += ../lib
libout = ../lib
@@ -67,10 +67,10 @@ project(DDS_VTopics_Receiver_stub) : ccm_stub, dds4ccm_base {
DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_lem_gen \
DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_lem_gen \
DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_gen \
- DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_gen
+ DDS_VTSSeq_Connector_stub DDS_VTSSeq_Connector_lem_gen
libs += DDS_VTopics_Connector_stub DDS_VTS_Valuetype_Connector_stub \
DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \
- DDS_VTS_Union_Connector_stub DDS_VTS_Seq_Connector_stub \
+ DDS_VTS_Union_Connector_stub DDS_VTSSeq_Connector_stub \
DDS_VTopics_Base_stub
libpaths += ../lib
libout = ../lib
@@ -102,12 +102,12 @@ project(DDS_VTopics_Receiver_exec) : ciao_executor, dds4ccm_base {
DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_lem_stub \
DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_lem_stub \
DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub \
- DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_stub \
+ DDS_VTSSeq_Connector_stub DDS_VTSSeq_Connector_lem_stub \
DDS4CCM_lem_stub
sharedname = Receiver_exec
libs += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \
DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
- DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
+ DDS_VTS_Array_Connector_stub DDS_VTSSeq_Connector_stub \
DDS_VTopics_Connector_lem_stub DDS4CCM_lem_stub \
DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub
libpaths += ../lib
@@ -139,12 +139,12 @@ project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_base {
DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \
DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_lem_stub \
DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_lem_stub \
- DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub \
+ DDS_VTSSeq_Connector_stub DDS_VTSSeq_Connector_svnt DDS_VTSSeq_Connector_lem_stub \
DDS4CCM_lem_stub DDS4CCM_skel
sharedname = Receiver_svnt
libs += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \
- DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
- DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt DDS_VTS_Seq_Connector_svnt \
+ DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTSSeq_Connector_stub \
+ DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt DDS_VTSSeq_Connector_svnt \
DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_stub \
DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_stub \
Receiver_exec DDS_VTopics_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
index b4011de4d40..6b612632335 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
@@ -61,10 +61,10 @@ project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base {
after += DDS_VTopics_Sender_idl_gen DDS_VTopics_Base_stub \
DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
DDS_VTS_Array_Connector_stub DDS_VTS_Valuetype_Connector_stub \
- DDS_VTS_Union_Connector_stub DDS_VTS_Seq_Connector_stub
+ DDS_VTS_Union_Connector_stub DDS_VTSSeq_Connector_stub
libs += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub \
DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \
- DDS_VTS_Seq_Connector_stub DDS_VTS_Valuetype_Connector_stub \
+ DDS_VTSSeq_Connector_stub DDS_VTS_Valuetype_Connector_stub \
DDS_VTS_Union_Connector_stub
includes += ..
libpaths += ../lib
@@ -96,13 +96,13 @@ project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_base {
DDS_VTS_Array_Connector_lem_stub DDS_VTS_Array_Connector_stub \
DDS_VTS_Valuetype_Connector_lem_stub DDS_VTS_Valuetype_Connector_stub \
DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub \
- DDS_VTS_Seq_Connector_lem_stub DDS_VTS_Seq_Connector_stub \
+ DDS_VTSSeq_Connector_lem_stub DDS_VTSSeq_Connector_stub \
DDS4CCM_lem_stub
sharedname = Sender_exec
libs += Sender_stub Sender_lem_stub DDS_VTopics_Base_stub \
DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub \
DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \
- DDS_VTS_Valuetype_Connector_stub DDS_VTS_Seq_Connector_stub \
+ DDS_VTS_Valuetype_Connector_stub DDS_VTSSeq_Connector_stub \
DDS_VTS_Union_Connector_stub DDS4CCM_lem_stub
libpaths += ../lib
includes += ..
@@ -134,7 +134,7 @@ project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_base {
DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \
DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_lem_stub \
DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_lem_stub \
- DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub
+ DDS_VTSSeq_Connector_stub DDS_VTSSeq_Connector_svnt DDS_VTSSeq_Connector_lem_stub
sharedname = Sender_svnt
libs += Sender_stub Sender_lem_stub \
DDS_VTopics_Base_stub \
@@ -144,7 +144,7 @@ project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_base {
DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt \
DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt \
DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt \
- DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt
+ DDS_VTSSeq_Connector_stub DDS_VTSSeq_Connector_svnt
libpaths += ../lib
libout = ../lib
includes += ..