diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-06-18 12:14:05 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-06-18 12:14:05 +0000 |
| commit | 2b94dbb28b7f8c8e205fece96eaecec0b2800f62 (patch) | |
| tree | ba65949e24d9779c72bb51a2635a4c4156ce93bf | |
| parent | b58291aff94f64115bb4139b61b82b3e656eea1e (diff) | |
| download | ATCD-2b94dbb28b7f8c8e205fece96eaecec0b2800f62.tar.gz | |
| -rw-r--r-- | CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 53097cdd975..1b581f6c499 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 18 12:13:48 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/dds/Getter_T.cpp: + Layout changes + Fri Jun 18 12:04:03 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: diff --git a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp index 6cafbd47751..8ca962b6c79 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp @@ -119,7 +119,8 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many ( "CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::Getter_Base_T::get_many - " "Error while reading from DDS: <%C>\n", translate_retcode (retcode))); - DDS_ReturnCode_t const retval = this->impl ()->return_loan (data, sample_info); + DDS_ReturnCode_t const retval = + this->impl ()->return_loan (data, sample_info); if (retval != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO @@ -130,7 +131,8 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many ( throw CCM_DDS::InternalError (retcode, 1); } - DDS_ReturnCode_t const retval = this->impl ()->return_loan (data, sample_info); + DDS_ReturnCode_t const retval = + this->impl ()->return_loan (data, sample_info); if (retval != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO |