Fri Jun 18 11:41:47 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/dds/DataReader_T.h:
        * connectors/dds4ccm/impl/dds/DataReader_T.cpp:
          Removed static

3 files changed, 15 insertions, 11 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 6123d0c859c..9ec9e0115b4 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 18 11:41:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/dds/DataReader_T.h:
+        * connectors/dds4ccm/impl/dds/DataReader_T.cpp:
+          Removed static
+
 Fri Jun 18 11:19:53 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp
index e3e71bce9ac..53916c8d660 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp
@@ -9,9 +9,6 @@
 #include "dds4ccm/impl/dds/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-DDSQueryCondition * CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE>::qc_listener_ = 0;
-
-template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE>::DataReader_T (void)
   : CCM_DDS_DataReader_i (0),
     impl_ (0),
@@ -179,7 +176,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE>::query (void)
                     "Error: No QueryCondition set yet. First set a filter.\n"));
       throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
     }
-  ::CCM_DDS::QueryFilter_var filter = 0;
+  ::CCM_DDS::QueryFilter_var filter;
   ACE_NEW_THROW_EX (filter,
                     ::CCM_DDS::QueryFilter(),
                     CORBA::NO_MEMORY ());
@@ -325,7 +322,8 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE>::attach_querycondition (void)
                         DDSWaitSet (),
                         CORBA::NO_MEMORY ());
     }
-  DDS_ReturnCode_t const retcode = this->ws_->attach_condition (this->get_querycondition ());
+  DDS_ReturnCode_t const retcode =
+    this->ws_->attach_condition (this->get_querycondition ());
   if (retcode != DDS_RETCODE_OK)
     {
       DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DataReader_T::create_querycondition - "
@@ -346,7 +344,9 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE>::wait (
      this->ws_->wait (active_conditions, time_out);
    if (retcode == ::DDS::RETCODE_TIMEOUT)
      {
-       DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter: No data available after timeout.\n")));
+       DDS4CCM_DEBUG (6,
+                      (LM_DEBUG,
+                      ACE_TEXT ("Getter: No data available after timeout.\n")));
        return false;
      }
    return true;
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h b/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h
index 55e010d52b9..700e4d561d5 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h
+++ b/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h
@@ -73,8 +73,7 @@ namespace CIAO
 
       // Getter related methods.
       void
-      remove_condition (DDSQueryCondition * qc,
-                        const char * type);
+      remove_condition (DDSQueryCondition * qc, const char * type);
 
       void remove_conditions (void);
 
@@ -87,8 +86,7 @@ namespace CIAO
       void attach_querycondition (void);
 
       bool
-      wait (DDSConditionSeq & active_conditions,
-            DDS_Duration_t & time_out);
+      wait (DDSConditionSeq & active_conditions, DDS_Duration_t & time_out);
 
       void set_proxy (DDSDataReader * dr);
 
@@ -117,7 +115,7 @@ namespace CIAO
       // differs for all entities.
       DDSQueryCondition * qc_reader_;
       DDSQueryCondition * qc_getter_;
-      static DDSQueryCondition * qc_listener_;
+      DDSQueryCondition * qc_listener_;
 
       typename DDS_TYPE::data_reader * impl (void);
     };