Merge branch 'master' into jwi-dynamicany

jwillemsen · May 22, 2024 · f7fd457 · f7fd457
2 parents 18dc6f8 + e0d8ed1
commit f7fd457
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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 <vector>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -79,7 +79,7 @@ namespace TAO
     size_t size () const;
 
   private:
-    typedef ACE_Array_Base<RegisteredInterceptor> RegisteredArray;
+    using RegisteredArray = std::vector<RegisteredInterceptor>;
 
     /// Dynamic array of registered interceptors.
     RegisteredArray interceptors_;

diff --git 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<CORBA::Any> Table;
+    /// Type for the underyling "slot table."
+    using Table = ACE_Array_Base<CORBA::Any>;
 
     /// Return a reference to the slot table currently associated
     /// with this PICurrent_Impl object.