Merge branch 'master' into release/3.1

rticommunity · Dec 1, 2020 · 5c0ba94 · 5c0ba94
2 parents 6f9ba65 + e47d422
commit 5c0ba94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/srcCpp/connextDDS/RTIDDSImpl.cxx b/srcCpp/connextDDS/RTIDDSImpl.cxx
@@ -3460,6 +3460,7 @@ bool RTIDDSImpl<T>::configure_reader_qos(
                         dw_qos.protocol.rtps_reliable_writer.max_send_window_size)
                     << "\n";
 
+      #ifdef RTI_FLATDATA_AVAILABLE
         // writer_loaned_sample_allocation
         if (_isFlatData) {
             stringStream << "\twriter_loaned_sample_allocation (initial_count/max_count): "
@@ -3475,6 +3476,7 @@ bool RTIDDSImpl<T>::configure_reader_qos(
                             _isFlatData ? DDS_LENGTH_UNLIMITED : _PM->get<int>("unbounded"))
                         << "\n";
         }
+      #endif
 
         // Heartbeats per max samples
         stringStream << "\tHeartbeats per max samples: "

diff --git a/srcDoc/tutorials/performance_validation.rst b/srcDoc/tutorials/performance_validation.rst
@@ -21,7 +21,7 @@ information about the environment:
 Prepare the tools
 ~~~~~~~~~~~~~~~~~
 
-To run this test, we will need *RTI Perftest 3.0* (Perftest). We will compile it against
+To run this test, we will need *RTI Perftest 3.1* (Perftest). We will compile it against
 *RTI Connext DDS Professional 6.0.0* and *RTI Connext DDS Micro 3.0.0*.
 
 Get Perftest