Wed Nov 18 09:24:04 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/impl/ndds/Getter_T.h:
        * connectors/dds4ccm/impl/ndds/Getter_T.cpp:
        * connectors/dds4ccm/impl/ndds/Writer_T.h:
        * connectors/dds4ccm/impl/ndds/Writer_T.cpp:
          Fixed compiler issues related to TAO IDL compiler
          fix (see Tue Nov 17 20:47:27 UTC 2009  Jeff Parsons in
          TAO changelog for details).

5 files changed, 17 insertions, 6 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 2f41fd099ec..acaef99ca54 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+
+Wed Nov 18 09:24:04 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/Getter_T.h:
+        * connectors/dds4ccm/impl/ndds/Getter_T.cpp:
+        * connectors/dds4ccm/impl/ndds/Writer_T.h:
+        * connectors/dds4ccm/impl/ndds/Writer_T.cpp:
+          Fixed compiler issues related to TAO IDL compiler
+          fix (see Tue Nov 17 20:47:27 UTC 2009  Jeff Parsons in
+          TAO changelog for details).
+
 Wed Nov 18 09:20:10 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/ndds/Connector_T.cpp:
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
index e87ec67dddc..e0c39a2ef8f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
@@ -166,7 +166,7 @@ CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::time_out (
 
 template <typename DDS_TYPE, typename CCM_TYPE >
 ::CCM_DDS::DataNumber_t
-CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (void) const
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (void)
 {
   return this->max_delivered_data_;
 }
@@ -174,7 +174,7 @@ CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (void) cons
 template <typename DDS_TYPE, typename CCM_TYPE >
 void
 CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (
-  const ::CCM_DDS::DataNumber_t & max_delivered_data)
+  ::CCM_DDS::DataNumber_t max_delivered_data)
 {
   this->max_delivered_data_ = max_delivered_data;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
index a6099a82b49..52283f85840 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
@@ -42,8 +42,8 @@ namespace CIAO
         virtual ::DDS::Duration_t time_out (void);
         virtual void time_out (const ::DDS::Duration_t & time_out);
 
-        virtual ::CCM_DDS::DataNumber_t max_delivered_data (void) const;
-        virtual void max_delivered_data (const ::CCM_DDS::DataNumber_t & max_delivered_data);
+        virtual ::CCM_DDS::DataNumber_t max_delivered_data (void);
+        virtual void max_delivered_data (::CCM_DDS::DataNumber_t max_delivered_data);
       private:
         bool wait (DDSConditionSeq& active_conditions);
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp
index 9bce51e39dd..ac4ead5b16f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp
@@ -83,7 +83,7 @@ CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_many (
 
 template <typename DDS_TYPE, typename CCM_TYPE >
 ::CORBA::Boolean
-CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (void) const
+CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (void)
 {
   return this->is_coherent_write_;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h
index 08b4c7dbd64..370d777d3ec 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h
@@ -38,7 +38,7 @@ namespace CIAO
         virtual void write_many (
           const typename CCM_TYPE::seq_type& instances);
 
-        virtual ::CORBA::Boolean is_coherent_write (void) const;
+        virtual ::CORBA::Boolean is_coherent_write (void);
 
         virtual void is_coherent_write ( ::CORBA::Boolean value);