diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-20 12:11:28 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-20 12:11:28 +0000 |
| commit | 1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5 (patch) | |
| tree | 78fc0571a66bb48c5b2565e10ceef69cfe5afff2 /CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver | |
| parent | 6f8f4ebd99e45fe3e24a40c6cc7cf03bf8d31c24 (diff) | |
| download | ATCD-1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5.tar.gz | |
Merged RemedyWork branch.
ChangeLogTag: Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver')
| -rwxr-xr-x | CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp | 22 | ||||
| -rwxr-xr-x | CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc | 6 |
2 files changed, 11 insertions, 17 deletions
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp index fb39c89d298..5eb637a19fd 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp @@ -5,15 +5,10 @@ #include "ace/OS_NS_unistd.h" -typedef ::CIAO::NDDS::DataReader_T<ShapeType_DDS_Traits::datareader_type, - ShapeType_DDS_Traits::typed_reader_type, - ShapeType_DDS_Traits::value_type, - ShapeTypeSeq, - ShapeType_DDS_Traits::dds_seq_type> - ShapesDataReader; +typedef ::I2C_Shapes::DataReader TypedDataReader; void -read (ShapesDataReader* shapes_dr) +read (TypedDataReader::_ptr_type shapes_dr) { int samples_received = 0; if (shapes_dr) @@ -23,7 +18,7 @@ read (ShapesDataReader* shapes_dr) //start to read ShapeTypeSeq data; ::DDS::SampleInfoSeq info; - ::DDS::ReturnCode_t retcode = shapes_dr->read ( + ::DDS::ReturnCode_t retcode = shapes_dr->take ( data, info, ::DDS::LENGTH_UNLIMITED, @@ -74,15 +69,14 @@ int ACE_TMAIN (int , ACE_TCHAR *[]) } ::DDS::Topic_var topic = common.get_topic (); - ::DDS::DataReader_var dr; - ::DDS::DataReaderQos dqos; - dr = subscriber->create_datareader (topic.in (), - dqos, + ::DDS::DataReader_var dr = subscriber->create_datareader_with_profile ( + topic.in (), + QOS_PROFILE, ::DDS::DataReaderListener::_nil (), 0); - ShapesDataReader * shapes_dr = dynamic_cast <ShapesDataReader *>(dr.in ()); - read (shapes_dr); + TypedDataReader::_var_type shapes_dr = TypedDataReader::_narrow (dr.in ()); + read (shapes_dr.in ()); } catch (::CORBA::Exception &e) { diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc index 8e4b2a14897..e34f940b46a 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc @@ -1,12 +1,12 @@ // $Id$ -project(*i2c_shapes_receiver) : ndds_impl, dds4ccm_stub, dds4ccm_ts_default { +project(*i2c_shapes_rec) : ndds_impl, ndds_stub, ndds_ts_default { exename = I2C_Shapes_Receiver - after += I2C_Shapes_Base_Stub I2C_Shapes_Connector_stub I2C_Shapes_Common + after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors - libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub I2C_Shapes_Common + libs += I2C_Shapes_Base_stub I2C_ShapeType_stub I2C_Shapes_Common libpaths += ../lib exeout += ../lib |