Fri Dec 3 14:20:25 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
        * connectors/dds4ccm/impl/Getter_T.cpp:
        * connectors/dds4ccm/impl/Updater_T.cpp:
          Replace some DDS_xxx defines with ::DDS::xxx defines. DDS_xxx defines
          are not allowed in the DDS4CCM core.

4 files changed, 20 insertions, 12 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 9088ad96100..396da9b8fb9 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Dec  3 14:20:25 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
+        * connectors/dds4ccm/impl/Getter_T.cpp:
+        * connectors/dds4ccm/impl/Updater_T.cpp:
+          Replace some DDS_xxx defines with ::DDS::xxx defines. DDS_xxx defines
+          are not allowed in the DDS4CCM core.
+
 Fri Dec  3 13:01:04 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h:
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
index 6fd88a9b12d..4fa4a119785 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
@@ -118,9 +118,9 @@ namespace CIAO
               result = reader->take (data,
                                      sample_info,
                                      max_samples,
-                                     DDS_NOT_READ_SAMPLE_STATE,
-                                     DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                                     DDS_ANY_INSTANCE_STATE);
+                                     ::DDS::NOT_READ_SAMPLE_STATE,
+                                     ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
+                                     ::DDS::ANY_INSTANCE_STATE);
             }
 
           if (result == ::DDS::RETCODE_NO_DATA)
@@ -142,7 +142,7 @@ namespace CIAO
                   // deleted so don't check the valid_data flag
                   // here.
                   if (sample_info[i].instance_state ==
-                          ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE)
+                          ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
                     {
                       ::CCM_DDS::ReadInfo readinfo;
                       readinfo <<= sample_info[i];
@@ -150,7 +150,7 @@ namespace CIAO
                     }
                   else if (sample_info[i].valid_data)
                     {
-                      if (sample_info[i].view_state == ::DDS_NEW_VIEW_STATE)
+                      if (sample_info[i].view_state == ::DDS::NEW_VIEW_STATE)
                         {
                           ::CCM_DDS::ReadInfo readinfo;
                           readinfo <<= sample_info[i];
@@ -173,8 +173,8 @@ namespace CIAO
               for (::CORBA::ULong i = 0 ; i < sample_info.length(); i++)
                 {
                   if ((sample_info[i].valid_data &&
-                       sample_info[i].view_state == ::DDS_NEW_VIEW_STATE) ||
-                       sample_info[i].instance_state == ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE)
+                       sample_info[i].view_state == ::DDS::NEW_VIEW_STATE) ||
+                       sample_info[i].instance_state == ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
                     {
                       if (updates.size () > 0)
                         {
@@ -200,14 +200,14 @@ namespace CIAO
                         }
                       // Now invoke on_creation or on_deletion
                       if (sample_info[i].valid_data &&
-                          sample_info[i].view_state == ::DDS_NEW_VIEW_STATE)
+                          sample_info[i].view_state == ::DDS::NEW_VIEW_STATE)
                         {
                           ::CCM_DDS::ReadInfo readinfo;
                           readinfo <<= sample_info[i];
                           this->listener_->on_creation (data[i], readinfo);
                         }
                       else if (sample_info[i].instance_state ==
-                               ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE)
+                               ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
                         {
                           ::CCM_DDS::ReadInfo readinfo;
                           readinfo <<= sample_info[i];
diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
index 9204d6bf895..a126f156368 100644
--- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
@@ -130,7 +130,7 @@ namespace CIAO
       ::CORBA::Long max_samples = this->max_delivered_data_;
       if (max_samples == 0)
         {
-          max_samples = DDS_LENGTH_UNLIMITED;
+          max_samples = ::DDS::LENGTH_UNLIMITED;
         }
 
       ::DDS::SampleInfoSeq sample_info;
diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
index d2f98ce0ef8..dd084a20f45 100644
--- a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
@@ -130,7 +130,7 @@ namespace CIAO
 
           if (hnd != instance_handle)
             {
-              throw ::CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0);
+              throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
             }
         }
       if (hnd == ::DDS::HANDLE_NIL)
@@ -190,7 +190,7 @@ namespace CIAO
 
           if (hnd != instance_handle)
             {
-              throw ::CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0);
+              throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
             }
         }
       if (hnd == ::DDS::HANDLE_NIL)