diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-26 14:54:21 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-26 14:54:21 +0000 |
| commit | 90702ca95e8672488516e42d3aa0fcdb8b5581aa (patch) | |
| tree | a15e8ffbfd8068815d1f400025f38fc819cb9de6 | |
| parent | a1a7799592ee8f44d6bd05e093d862c0a2b9f208 (diff) | |
| download | ATCD-90702ca95e8672488516e42d3aa0fcdb8b5581aa.tar.gz | |
Thu Aug 26 14:54:25 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
Slightly changed the dds traits
* tests/MProfile_Connection_Timeout/test_i.cpp:
Removed rcsid
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp | 6 | ||||
| -rw-r--r-- | TAO/tests/MProfile_Connection_Timeout/test_i.cpp | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2e205a49095..dcf11819f2b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Aug 26 14:54:25 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + Slightly changed the dds traits + + * tests/MProfile_Connection_Timeout/test_i.cpp: + Removed rcsid + Thu Aug 26 13:44:36 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/Dump_Schedule/Dump_Schedule.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index 33f25aec814..7874bf9b22f 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -170,10 +170,12 @@ be_visitor_connector_dds_exh::gen_dds_traits (void) os_ << "Seq dds_seq_type;" << be_nl << "typedef ::" << dt_name << "TypeSupport type_support;" << be_nl + << "typedef ::DDS_SampleInfoSeq sampleinfo_seq_type;" << be_nl + << "typedef ::DDS_SampleInfo sampleinfo_type;" << be_nl << "typedef ::" << dt_name - << "DataWriter data_writer;" << be_nl + << "DataWriter datawriter_type;" << be_nl << "typedef ::" << dt_name - << "DataReader data_reader;" << be_uidt_nl + << "DataReader datareader_type;" << be_uidt_nl << "};"; } } diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp index 81c92cbb04c..c9666c5d7ab 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp @@ -1,11 +1,8 @@ +// -*- C++ -*- // $Id$ #include "test_i.h" -ACE_RCSID(MProfile_Connection_Timeout, - test_i, - "$Id$") - // part of the famous caesium 133 atom transition for a // second. Cannot represent the last part since the value gets out of // range. |