From 4cb33f4722a105961c3eda2c8cf109c4a280f08f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 21 May 2024 15:51:48 +0200 Subject: [PATCH 1/2] Merge --- TAO/tao/PI/Interceptor_List_T.cpp | 6 +++--- TAO/tao/PI/Interceptor_List_T.h | 6 +++--- TAO/tao/PI/PICurrent_Impl.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index 929797f21c146..1e9a5f0be9f08 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -87,7 +87,7 @@ namespace TAO /// Increase the length of the Interceptor sequence by one. size_t const new_len = old_len + 1; - this->interceptors_.size (new_len); + this->interceptors_.resize (new_len); // Add the interceptor this->interceptors_[old_len].interceptor_ = @@ -162,7 +162,7 @@ namespace TAO /// Increase the length of the Interceptor sequence by one. size_t const new_len = old_len + 1; - this->interceptors_.size (new_len); + this->interceptors_.resize (new_len); // Add the interceptor this->interceptors_[old_len].interceptor_ = @@ -207,7 +207,7 @@ namespace TAO // since some interceptors may not have been destroyed yet. // Note that this size reduction is fast since no memory is // actually deallocated. - this->interceptors_.size (ilen); + this->interceptors_.resize (ilen); } } catch (...) diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index 049027473eca5..526e1c43187e8 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "ace/Array_Base.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" +#include TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -79,7 +79,7 @@ namespace TAO size_t size () const; private: - typedef ACE_Array_Base RegisteredArray; + using RegisteredArray = std::vector; /// Dynamic array of registered interceptors. RegisteredArray interceptors_; diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index cad2844f78d67..ed7a6cd768c83 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -83,8 +83,8 @@ namespace TAO /// been changed.) void set_callback_for_impending_change (PICurrent_Impl *p); - /// Typedef for the underyling "slot table." - typedef ACE_Array_Base Table; + /// Type for the underyling "slot table." + using Table = ACE_Array_Base ; /// Return a reference to the slot table currently associated /// with this PICurrent_Impl object. From deef2c3a1a0ee49bd501f71161cda1ea95149daa Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 21 May 2024 15:55:09 +0200 Subject: [PATCH 2/2] Whitespace * TAO/tao/PI/PICurrent_Impl.h: --- TAO/tao/PI/PICurrent_Impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index ed7a6cd768c83..9055930e6cfa8 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -84,7 +84,7 @@ namespace TAO void set_callback_for_impending_change (PICurrent_Impl *p); /// Type for the underyling "slot table." - using Table = ACE_Array_Base ; + using Table = ACE_Array_Base; /// Return a reference to the slot table currently associated /// with this PICurrent_Impl object.