Merge branch 'fix_version20' of https://github.com/omg-dds/dds-rtps into fix_version20

Author: angelrti

srcCxx/shape_configurator_eprosima_fast_dds.h

@@ -32,9 +32,6 @@
 namespace DDS = eprosima::fastdds::dds;
 #define RETCODE_OK DDS::RETCODE_OK
 
-#define DDS_BOOLEAN_TRUE                   true
-#define DDS_BOOLEAN_FALSE                  false
-
 const char* get_qos_policy_name(DDS::QosPolicyId_t policy_id)
 {
   switch (policy_id) {

srcCxx/shape_configurator_opendds.h

@@ -18,9 +18,6 @@
 #define STRING_INOUT .inout()
 #define STRING_ALLOC(LHS, RHS) LHS = CORBA::string_alloc(RHS)
 
-#define DDS_BOOLEAN_TRUE                   true
-#define DDS_BOOLEAN_FALSE                  false
-
 const char* get_qos_policy_name(DDS::QosPolicyId_t policy_id)
 {
   switch (policy_id) {

srcCxx/shape_main.cxx

@@ -57,6 +57,12 @@
 #ifndef ADD_PARTITION
 #define ADD_PARTITION(field, value) StringSeq_push(field.name, value)
 #endif
+#ifndef DDS_BOOLEAN_TRUE
+#define DDS_BOOLEAN_TRUE true
+#endif
+#ifndef DDS_BOOLEAN_FALSE
+#define DDS_BOOLEAN_FALSE false
+#endif
 
 using namespace DDS;
 
@@ -1339,7 +1345,7 @@ class ShapeApplication {
 
         logger.log_message("Subscriber QoS:", Verbosity::DEBUG);
 
-#if   defined(RTI_CONNEXT_DDS) || defined(TWINOAKS_COREDX)
+#if   defined(RTI_CONNEXT_DDS) || defined(TWINOAKS_COREDX) || defined(INTERCOM_DDS)
         if (options->coherent_set_enabled) {
             sub_qos.presentation.coherent_access = DDS_BOOLEAN_TRUE;
         }
@@ -1348,13 +1354,21 @@ class ShapeApplication {
         }
         if (options->ordered_access_enabled || options->coherent_set_enabled) {
             sub_qos.presentation.access_scope = options->coherent_set_access_scope;
-  #if defined(TWINOAKS_COREDX)
+  #if defined(TWINOAKS_COREDX) || defined(INTERCOM_DDS)
             if ( sub_qos.presentation.access_scope >= GROUP_PRESENTATION_QOS )
               {
                 logger.log_message("    Presentation Access Scope "
                                    + QosUtils::to_string(sub_qos.presentation.access_scope)
                                    + std::string(" : Not supported"), Verbosity::ERROR);
               }
+  #endif
+  #if defined(INTERCOM_DDS)
+            if (sub_qos.presentation.coherent_access && sub_qos.presentation.access_scope >= TOPIC_PRESENTATION_QOS)
+              {
+                logger.log_message("    Coherent Access with Presentation Access Scope "
+                                   + QosUtils::to_string(sub_qos.presentation.access_scope)
+                                   + std::string(" : Not supported"), Verbosity::ERROR);
+              }
   #endif
         }