Fri Jun 18 12:04:03 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp:
        * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp:
        * connectors/dds4ccm/impl/dds/DataReader_T.h:
        * connectors/dds4ccm/impl/dds/DataReader_T.cpp:
        * connectors/dds4ccm/impl/dds/Getter_T.cpp:
          Code cleanup

6 files changed, 27 insertions, 19 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 2ace4a28264..53097cdd975 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jun 18 12:04:03 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DataReader_T.h:
+        * connectors/dds4ccm/impl/dds/DataReader_T.cpp:
+        * connectors/dds4ccm/impl/dds/Getter_T.cpp:
+          Code cleanup
+
 Fri Jun 18 12:03:29 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/LocalityManager/Scheduler/Deployment_Event.cpp:
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp
index fba6faf5d28..89fb8f9e64c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp
@@ -81,7 +81,8 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::
 
   typename DDS_TYPE::dds_seq_type data;
   DDS_SampleInfoSeq sample_info;
-  ::DDS::ReturnCode_t const result = reader->take (data, sample_info);
+  ::DDS::ReturnCode_t const result =
+    reader->take (data, sample_info, DDS_LENGTH_UNLIMITED);
 
   if (result == DDS_RETCODE_NO_DATA)
     {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp
index 2ead3166ea4..6a2309948c3 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp
@@ -73,16 +73,17 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_
 
   if (!reader)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO ACE_TEXT ("DataReaderStateListener_T::on_data_available_i - "
-                                             "Failed to retrieve pointer to proxy from "
-                                             "DDSDataReader.\n")));
+      DDS4CCM_ERROR (1, (LM_ERROR,
+                         CLINFO ACE_TEXT ("DataReaderStateListener_T::on_data_available_i - "
+                         "Failed to retrieve pointer to proxy from "
+                         "DDSDataReader.\n")));
       return;
     }
 
   try
     {
       typename DDS_TYPE::dds_seq_type data;
-      DDS_SampleInfoSeq sample_info;
+      ::DDS_SampleInfoSeq sample_info;
       ::DDS_Long max_samples = 0;
 
       this->control_->mode () == ::CCM_DDS::ONE_BY_ONE
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp
index 53916c8d660..fcd007e3709 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp
@@ -462,8 +462,7 @@ void
 CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE>::passivate ()
 {
   this->remove_conditions ();
-  this->set_listener (::DDS::DataReaderListener::_nil (),
-                      0);
+  this->set_listener (::DDS::DataReaderListener::_nil (), 0);
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
@@ -543,8 +542,8 @@ void
 CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE>::delete_datareader (
   ::DDS::Subscriber_ptr subscriber)
 {
-  ::DDS::ReturnCode_t retval = subscriber->delete_datareader (this);
-  if (retval != DDS::RETCODE_OK)
+  ::DDS::ReturnCode_t const retval = subscriber->delete_datareader (this);
+  if (retval != ::DDS::RETCODE_OK)
     {
       DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
         "DataReader_T::delete_datareader - "
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h b/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h
index 700e4d561d5..190ae9bbbf2 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h
+++ b/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h
@@ -46,12 +46,12 @@ namespace CIAO
       DDS_ReturnCode_t read_w_condition (
         typename DDS_TYPE::dds_seq_type & data,
         ::DDS_SampleInfoSeq & sample_info,
-        ::DDS_Long max_samples=1);
+        ::DDS_Long max_samples);
 
       DDS_ReturnCode_t take (
         typename DDS_TYPE::dds_seq_type & data,
         ::DDS_SampleInfoSeq & sample_info,
-        ::DDS_Long max_samples=DDS_LENGTH_UNLIMITED);
+        ::DDS_Long max_samples);
 
       DDS_InstanceHandle_t
       lookup_instance (const typename DDS_TYPE::value_type& an_instance);
@@ -72,8 +72,7 @@ namespace CIAO
                   DDSQueryCondition * qc);
 
       // Getter related methods.
-      void
-      remove_condition (DDSQueryCondition * qc, const char * type);
+      void remove_condition (DDSQueryCondition * qc, const char * type);
 
       void remove_conditions (void);
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp
index d9b1b01d625..6cafbd47751 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp
@@ -195,8 +195,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one (
   ::CCM_DDS::ReadInfo_out info)
 {
   DDSConditionSeq active_conditions;
-  if (!this->impl ()->wait (active_conditions,
-                            this->time_out_))
+  if (!this->impl ()->wait (active_conditions, this->time_out_))
     {
       return false;
     }
@@ -214,7 +213,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one (
               typename DDS_TYPE::dds_seq_type data;
 
               ::DDS::ReturnCode_t const retcode =
-                this->impl ()->read_w_condition (data, sample_info);
+                this->impl ()->read_w_condition (data, sample_info, 1);
               if (retcode == ::DDS::RETCODE_NO_DATA)
                 {
                   DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
@@ -253,7 +252,8 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one (
                         "No valid available in DDS.\n"));
                 }
               // Return the loan of each read.
-              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
@@ -298,8 +298,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, false>::get_one (
               DDS_SampleInfoSeq sample_info;
               typename DDS_TYPE::dds_seq_type data;
               DDS_ReturnCode_t const retcode =
-                this->impl ()->read_w_condition (data,
-                                                 sample_info);
+                this->impl ()->read_w_condition (data, sample_info, 1);
               if (retcode == ::DDS::RETCODE_NO_DATA)
                 {
                   DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO