Merge branch 'master' into warnings

mitza-oci · Jun 19, 2024 · 8cece07 · 8cece07
2 parents a549ac4 + f9470e6
commit 8cece07
Show file tree

Hide file tree

Showing 55 changed files with 433 additions and 264 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -57,7 +57,7 @@ env:
   TRIGGERING_COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
   VCPKG_INSTALLED_DIR: ${{ github.workspace }}\vcpkg\installed
   CTEST_OUTPUT_ON_FAILURE: ON
-  VCPKG_GIT_COMMIT: 898b728edc5e0d12b50015f9cd18247c4257a3eb
+  VCPKG_GIT_COMMIT: f7423ee180c4b7f40d43402c2feb3859161ef625
 
 jobs:
 

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -57,7 +57,7 @@ env:
   TRIGGERING_COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
   VCPKG_INSTALLED_DIR: ${{ github.workspace }}\vcpkg\installed
   CTEST_OUTPUT_ON_FAILURE: ON
-  VCPKG_GIT_COMMIT: 898b728edc5e0d12b50015f9cd18247c4257a3eb
+  VCPKG_GIT_COMMIT: f7423ee180c4b7f40d43402c2feb3859161ef625
 
 jobs:
   u22:

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
@@ -44,7 +44,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
+        uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25
         with:
           context: .
           push: true

diff --git a/.github/workflows/ishapes.yml b/.github/workflows/ishapes.yml
@@ -8,7 +8,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  VCPKG_GIT_COMMIT: 898b728edc5e0d12b50015f9cd18247c4257a3eb
+  VCPKG_GIT_COMMIT: f7423ee180c4b7f40d43402c2feb3859161ef625
 
 jobs:
 
@@ -92,9 +92,9 @@ jobs:
         cd OpenDDS
         perl configure --optimize --no-debug --static --tests ^
           "--qt=%VCPKG_INSTALLED_DIR%/x64-windows" ^
-          "--mpc:value_template platforms=x64" ^
-          "--mpc:value_template configurations=Release" ^
-          "--mpc:value_template Release::runtime_library=MultiThreadedDLL"
+          --mpc:value_template platforms=x64 ^
+          --mpc:value_template configurations=Release ^
+          --mpc:value_template Release::runtime_library=MultiThreadedDLL
         tools\scripts\show_build_config.pl
     - name: build
       shell: cmd

diff --git a/acetao.ini b/acetao.ini
@@ -35,3 +35,20 @@ tar.gz-md5=6bbd4ef19fda1ff6a69fa8df33e72d06
 tar.bz2-filename=ACE+TAO-src-7.1.3.tar.bz2
 tar.bz2-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_3/ACE%2BTAO-src-7.1.3.tar.bz2
 tar.bz2-md5=a4a2cbb7c5eaec50f1fae041f0b4ee0d
+
+[ace8tao4]
+hold=0
+desc=ACE 8/TAO 4
+version=8.0.0
+repo=https://github.com/DOCGroup/ACE_TAO.git
+branch=master
+url=https://github.com/DOCGroup/ACE_TAO/releases/tag/ACE%2BTAO-8_0_0
+zip-filename=ACE+TAO-src-8.0.0.zip
+zip-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_0/ACE%2BTAO-src-8.0.0.zip
+zip-md5=e3c467db77570b57288bedfc02980dcd
+tar.gz-filename=ACE+TAO-src-8.0.0.tar.gz
+tar.gz-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_0/ACE%2BTAO-src-8.0.0.tar.gz
+tar.gz-md5=07b87e35172758a88904fedaf8a3a8a8
+tar.bz2-filename=ACE+TAO-src-8.0.0.tar.bz2
+tar.bz2-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_0/ACE%2BTAO-src-8.0.0.tar.bz2
+tar.bz2-md5=a55665e09071049099977ee5fa2af2a4
diff --git a/configure b/configure
@@ -224,6 +224,7 @@ my @specs =
     'mpc=s', 'MPC (use MPC_ROOT, ACE_ROOT/MPC, or download)',
     'doc-group|doc_group!', 'Use the DOC Group release of TAO 2.5.x (yes)',
     'doc-group3|doc_group3!', 'Use the DOC Group release of TAO 3.x (no)',
+    'ace-tao=s', 'Use the ACE/TAO version from acetao.ini',
     'ace-github-latest!', 'Clone latest ACE/TAO/MPC from GitHub (no)',
     'force-ace-tao', 'Force configuration of ACE/TAO (no)',
     'no-disable-deprecated', 'Turn off disabling deprecated interfaces when' .
@@ -997,6 +998,10 @@ if (!$ace_src || !$tao_src) {
     # Get ACE/TAO version info
     my ($section_names, $sections) = read_ini_file("$FindBin::RealBin/acetao.ini");
     my $ace_tao_version = $opts{'doc-group3'} ? $sections->{ace7tao3} : $sections->{ace6tao2};
+    if ($opts{'ace-tao'}) {
+      $ace_tao_version = $sections->{$opts{'ace-tao'}};
+      die "ERROR: No entry named '$opts{'ace-tao'}' in acetao.ini" unless $ace_tao_version;
+    }
     if ($opts{verbose}) {
       print("ACE/TAO Version Info:");
       new Dumpvalue()->dumpValue($ace_tao_version);

diff --git a/dds/DCPS/DataDurabilityCache.cpp b/dds/DCPS/DataDurabilityCache.cpp
@@ -783,8 +783,8 @@ OpenDDS::DCPS::DataDurabilityCache::get_data(
    */
   DDS::ReturnCode_t ret =
     data_writer->register_instance_from_durable_data(handle,
-                                     move(registration_sample),
-                                     registration_timestamp);
+                                                     OPENDDS_MOVE_NS::move(registration_sample),
+                                                     registration_timestamp);
 
   if (ret != DDS::RETCODE_OK)
     return false;
@@ -834,7 +834,7 @@ OpenDDS::DCPS::DataDurabilityCache::get_data(
                      sample_length);
       mb->wr_ptr(sample_length);
 
-      const DDS::ReturnCode_t ret = data_writer->write(move(mb),
+      const DDS::ReturnCode_t ret = data_writer->write(OPENDDS_MOVE_NS::move(mb),
                                                        handle,
                                                        source_timestamp,
                                                        0 /* no content filtering */,

diff --git a/dds/DCPS/DataReaderImpl_T.h b/dds/DCPS/DataReaderImpl_T.h
@@ -866,7 +866,7 @@ namespace OpenDDS {
 
       bool just_registered;
       unique_ptr<MessageTypeWithAllocator> data(new (*data_allocator()) MessageTypeWithAllocator(sample));
-      store_instance_data(move(data), DDS::HANDLE_NIL, header, instance, just_registered, filtered);
+      store_instance_data(OPENDDS_MOVE_NS::move(data), DDS::HANDLE_NIL, header, instance, just_registered, filtered);
       if (instance) inst = instance->instance_handle_;
     }
 
@@ -909,7 +909,7 @@ namespace OpenDDS {
       bool just_registered, filtered;
       unique_ptr<MessageTypeWithAllocator> data(new (*data_allocator()) MessageTypeWithAllocator);
       get_key_value(*data, instance);
-      store_instance_data(move(data), publication_handle, header, si, just_registered, filtered);
+      store_instance_data(OPENDDS_MOVE_NS::move(data), publication_handle, header, si, just_registered, filtered);
       if (!filtered) {
         notify_read_conditions();
       }
@@ -1086,7 +1086,7 @@ namespace OpenDDS {
         }
         return;
       }
-      store_instance_data(move(data), publication_handle, sample.header_, instance, just_registered, filtered);
+      store_instance_data(OPENDDS_MOVE_NS::move(data), publication_handle, sample.header_, instance, just_registered, filtered);
       return;
     }
     const bool encapsulated = sample.header_.cdr_encapsulation_;
@@ -1190,7 +1190,7 @@ namespace OpenDDS {
     }
 #endif
 
-    store_instance_data(move(data), publication_handle, sample.header_, instance, just_registered, filtered);
+    store_instance_data(OPENDDS_MOVE_NS::move(data), publication_handle, sample.header_, instance, just_registered, filtered);
   }
 
   virtual void dispose_unregister(const OpenDDS::DCPS::ReceivedDataSample& sample,
@@ -1929,7 +1929,7 @@ void store_instance_data(unique_ptr<MessageTypeWithAllocator> instance_data,
       if (!filtered && time_based_filter_instance(instance_ptr, now, deadline)) {
         filtered = true;
         if (qos_.reliability.kind == DDS::RELIABLE_RELIABILITY_QOS) {
-          delay_sample(handle, move(instance_data), header, just_registered, now, deadline);
+          delay_sample(handle, OPENDDS_MOVE_NS::move(instance_data), header, just_registered, now, deadline);
         }
       } else {
         // nothing time based filtered now
@@ -1942,7 +1942,7 @@ void store_instance_data(unique_ptr<MessageTypeWithAllocator> instance_data,
       }
     }
 
-    finish_store_instance_data(move(instance_data), header, instance_ptr, is_dispose_msg, is_unregister_msg);
+    finish_store_instance_data(OPENDDS_MOVE_NS::move(instance_data), header, instance_ptr, is_dispose_msg, is_unregister_msg);
   }
   else
   {
@@ -2317,7 +2317,7 @@ void delay_sample(DDS::InstanceHandle_t handle,
 #ifdef ACE_HAS_CPP11
       filter_delayed_sample_map_.emplace(std::piecewise_construct,
                                          std::forward_as_tuple(handle),
-                                         std::forward_as_tuple(move(data), hdr, just_registered));
+                                         std::forward_as_tuple(OPENDDS_MOVE_NS::move(data), hdr, just_registered));
 #else
       filter_delayed_sample_map_.insert(std::make_pair(handle, FilterDelayedSample(move(data), hdr, just_registered)));
 #endif
@@ -2335,7 +2335,7 @@ void delay_sample(DDS::InstanceHandle_t handle,
     FilterDelayedSample& sample = i->second;
     // we only care about the most recently filtered sample, so clean up the last one
 
-    sample.message = move(data);
+    sample.message = OPENDDS_MOVE_NS::move(data);
     sample.header = hdr;
     sample.new_instance = just_registered;
     // already scheduled for timeout at the desired time
@@ -2411,7 +2411,7 @@ void filter_delayed(const MonotonicTimePoint& now)
       const bool new_instance = data->second.new_instance;
 
       // should not use data iterator anymore, since finish_store_instance_data releases sample_lock_
-      finish_store_instance_data(move(data->second.message),
+      finish_store_instance_data(OPENDDS_MOVE_NS::move(data->second.message),
                                  *header,
                                  instance,
                                  NOT_DISPOSE_MSG,
@@ -2462,7 +2462,7 @@ typedef ACE_Strong_Bound_Ptr<const OpenDDS::DCPS::DataSampleHeader, ACE_Null_Mut
 #endif
 struct FilterDelayedSample {
   FilterDelayedSample(unique_ptr<MessageTypeWithAllocator> msg, DataSampleHeader_ptr hdr, bool new_inst)
-    : message(move(msg))
+    : message(OPENDDS_MOVE_NS::move(msg))
     , header(hdr)
     , new_instance(new_inst)
   {}

diff --git a/dds/DCPS/DataWriterImpl.cpp b/dds/DCPS/DataWriterImpl.cpp
@@ -541,15 +541,14 @@ DataWriterImpl::association_complete_i(const GUID_t& remote_id)
 
       DataSampleHeader header;
       Message_Block_Ptr end_historic_samples(
-        create_control_message(
-          END_HISTORIC_SAMPLES, header, move(data),
+        create_control_message(END_HISTORIC_SAMPLES, header, OPENDDS_MOVE_NS::move(data),
           SystemTimePoint::now().to_idl_struct()));
 
       this->controlTracker.message_sent();
       guard.release();
       ACE_Reverse_Lock<ACE_Recursive_Thread_Mutex> rev_lock(lock_);
       ACE_Guard<ACE_Reverse_Lock<ACE_Recursive_Thread_Mutex> > rev_guard(rev_lock);
-      SendControlStatus ret = send_w_control(list, header, move(end_historic_samples), remote_id);
+      SendControlStatus ret = send_w_control(list, header, OPENDDS_MOVE_NS::move(end_historic_samples), remote_id);
       if (ret == SEND_CONTROL_ERROR) {
         ACE_ERROR((LM_WARNING, ACE_TEXT("(%P|%t) WARNING: ")
                              ACE_TEXT("DataWriterImpl::association_complete_i: ")
@@ -775,12 +774,12 @@ void DataWriterImpl::replay_durable_data_for(const GUID_t& remote_id)
       ser << remote_id;
 
       DataSampleHeader header;
-      Message_Block_Ptr end_historic_samples(create_control_message(END_HISTORIC_SAMPLES, header, move(data),
+      Message_Block_Ptr end_historic_samples(create_control_message(END_HISTORIC_SAMPLES, header, OPENDDS_MOVE_NS::move(data),
                                                                     SystemTimePoint::now().to_idl_struct()));
 
       this->controlTracker.message_sent();
       guard.release();
-      const SendControlStatus ret = send_w_control(list, header, move(end_historic_samples), remote_id);
+      const SendControlStatus ret = send_w_control(list, header, OPENDDS_MOVE_NS::move(end_historic_samples), remote_id);
       if (ret == SEND_CONTROL_ERROR) {
         ACE_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) ERROR: ")
                    ACE_TEXT("DataWriterImpl::replay_durable_data_for: ")
@@ -1074,10 +1073,10 @@ DataWriterImpl::send_request_ack()
     create_control_message(
       REQUEST_ACK,
       element->get_header(),
-      move(blk),
+      OPENDDS_MOVE_NS::move(blk),
       SystemTimePoint::now().to_idl_struct()));
 
-  element->set_sample(move(sample));
+  element->set_sample(OPENDDS_MOVE_NS::move(sample));
 
   ret = this->data_container_->enqueue_control(element);
 
@@ -1645,10 +1644,10 @@ DataWriterImpl::register_instance_i(DDS::InstanceHandle_t& handle,
     create_control_message(
      INSTANCE_REGISTRATION,
      element->get_header(),
-     move(data),
+     OPENDDS_MOVE_NS::move(data),
      source_timestamp));
 
-  element->set_sample(move(sample));
+  element->set_sample(OPENDDS_MOVE_NS::move(sample));
 
   ret = this->data_container_->enqueue_control(element);
 
@@ -1678,7 +1677,7 @@ DataWriterImpl::register_instance_from_durable_data(
                    get_lock(),
                    DDS::RETCODE_ERROR);
 
-  const DDS::ReturnCode_t ret = register_instance_i(handle, move(data), source_timestamp);
+  const DDS::ReturnCode_t ret = register_instance_i(handle, OPENDDS_MOVE_NS::move(data), source_timestamp);
   if (ret != DDS::RETCODE_OK) {
     ACE_ERROR_RETURN((LM_ERROR,
                       ACE_TEXT("(%P|%t) ERROR: DataWriterImpl::register_instance_from_durable_data: ")
@@ -1739,9 +1738,9 @@ DataWriterImpl::unregister_instance_i(DDS::InstanceHandle_t handle,
 
   Message_Block_Ptr sample(create_control_message(UNREGISTER_INSTANCE,
                                                   element->get_header(),
-                                                  move(unregistered_sample_data),
+                                                  OPENDDS_MOVE_NS::move(unregistered_sample_data),
                                                   source_timestamp));
-  element->set_sample(move(sample));
+  element->set_sample(OPENDDS_MOVE_NS::move(sample));
 
   ret = this->data_container_->enqueue_control(element);
 
@@ -1811,9 +1810,9 @@ DataWriterImpl::dispose_and_unregister(DDS::InstanceHandle_t handle,
 
   Message_Block_Ptr sample(create_control_message(DISPOSE_UNREGISTER_INSTANCE,
                                                   element->get_header(),
-                                                  move(data_sample),
+                                                  OPENDDS_MOVE_NS::move(data_sample),
                                                   source_timestamp));
-  element->set_sample(move(sample));
+  element->set_sample(OPENDDS_MOVE_NS::move(sample));
 
   ret = this->data_container_->enqueue_control(element);
 
@@ -1906,13 +1905,13 @@ DataWriterImpl::write(Message_Block_Ptr data,
   }
 
   Message_Block_Ptr temp;
-  ret = create_sample_data_message(move(data),
+  ret = create_sample_data_message(OPENDDS_MOVE_NS::move(data),
                                    handle,
                                    element->get_header(),
                                    temp,
                                    source_timestamp,
                                    (filter_out != 0));
-  element->set_sample(move(temp));
+  element->set_sample(OPENDDS_MOVE_NS::move(temp));
 
   if (ret != DDS::RETCODE_OK) {
     data_container_->release_buffer(element);
@@ -2068,9 +2067,9 @@ DataWriterImpl::dispose(DDS::InstanceHandle_t handle,
 
   Message_Block_Ptr sample(create_control_message(DISPOSE_INSTANCE,
                                                   element->get_header(),
-                                                  move(registered_sample_data),
+                                                  OPENDDS_MOVE_NS::move(registered_sample_data),
                                                   source_timestamp));
-  element->set_sample(move(sample));
+  element->set_sample(OPENDDS_MOVE_NS::move(sample));
 
   ret = this->data_container_->enqueue_control(element);
 
@@ -2424,15 +2423,14 @@ DataWriterImpl::end_coherent_changes(const GroupCoherentSamples& group_samples)
 
   DataSampleHeader header;
   Message_Block_Ptr control(
-    create_control_message(
-      END_COHERENT_CHANGES, header, move(data),
+    create_control_message(END_COHERENT_CHANGES, header, OPENDDS_MOVE_NS::move(data),
       SystemTimePoint::now().to_idl_struct()));
 
   this->coherent_ = false;
   this->coherent_samples_ = 0;
 
   guard.release();
-  if (this->send_control(header, move(control)) == SEND_CONTROL_ERROR) {
+  if (this->send_control(header, OPENDDS_MOVE_NS::move(control)) == SEND_CONTROL_ERROR) {
     ACE_ERROR((LM_ERROR,
                ACE_TEXT("(%P|%t) ERROR: DataWriterImpl::end_coherent_changes:")
                ACE_TEXT(" unable to send END_COHERENT_CHANGES control message!\n")));
@@ -2548,11 +2546,10 @@ DataWriterImpl::send_liveliness(const MonotonicTimePoint& now)
     DataSampleHeader header;
     Message_Block_Ptr empty;
     Message_Block_Ptr liveliness_msg(
-      create_control_message(
-        DATAWRITER_LIVELINESS, header, move(empty),
+      create_control_message(DATAWRITER_LIVELINESS, header, OPENDDS_MOVE_NS::move(empty),
         SystemTimePoint::now().to_idl_struct()));
 
-    if (this->send_control(header, move(liveliness_msg)) == SEND_CONTROL_ERROR) {
+    if (this->send_control(header, OPENDDS_MOVE_NS::move(liveliness_msg)) == SEND_CONTROL_ERROR) {
       ACE_ERROR_RETURN((LM_ERROR,
                         ACE_TEXT("(%P|%t) ERROR: DataWriterImpl::send_liveliness: ")
                         ACE_TEXT("send_control failed.\n")),
@@ -2801,7 +2798,7 @@ DataWriterImpl::send_control(const DataSampleHeader& header,
 {
   controlTracker.message_sent();
 
-  SendControlStatus status = TransportClient::send_control(header, move(msg));
+  SendControlStatus status = TransportClient::send_control(header, OPENDDS_MOVE_NS::move(msg));
 
   if (status != SEND_CONTROL_OK) {
     controlTracker.message_dropped();
@@ -3130,7 +3127,7 @@ DDS::ReturnCode_t DataWriterImpl::get_or_create_instance_handle(
     }
 
     // tell DataWriterLocal and Publisher about the instance.
-    const DDS::ReturnCode_t ret = register_instance_i(handle, move(serialized), source_timestamp);
+    const DDS::ReturnCode_t ret = register_instance_i(handle, OPENDDS_MOVE_NS::move(serialized), source_timestamp);
     // note: the WriteDataContainer/PublicationInstance maintains ownership
     // of the marshalled sample.
     if (ret != DDS::RETCODE_OK) {
@@ -3250,7 +3247,7 @@ DDS::ReturnCode_t DataWriterImpl::write_sample(
     return DDS::RETCODE_ERROR;
   }
 
-  return write(move(serialized), handle, source_timestamp, filter_out, sample.native_data());
+  return write(OPENDDS_MOVE_NS::move(serialized), handle, source_timestamp, filter_out, sample.native_data());
 }
 
 } // namespace DCPS

diff --git a/dds/DCPS/RTPS/RtpsDiscovery.h b/dds/DCPS/RTPS/RtpsDiscovery.h
@@ -151,8 +151,8 @@ class OpenDDS_Rtps_Export RtpsDiscovery : public DCPS::Discovery {
   DCPS::TimeDuration auth_resend_period() const { return config_->auth_resend_period(); }
   void auth_resend_period(const DCPS::TimeDuration& x) { config_->auth_resend_period(x); }
 
-  u_short max_spdp_sequence_msg_reset_check() const { return config_->max_spdp_sequence_msg_reset_check(); }
-  void max_spdp_sequence_msg_reset_check(u_short reset_value) { config_->max_spdp_sequence_msg_reset_check(reset_value); }
+  u_short max_spdp_sequence_msg_reset_checks() const { return config_->max_spdp_sequence_msg_reset_checks(); }
+  void max_spdp_sequence_msg_reset_checks(u_short reset_value) { config_->max_spdp_sequence_msg_reset_checks(reset_value); }
 
   bool rtps_relay_only() const { return config_->rtps_relay_only(); }
   void rtps_relay_only_now(bool f);