Merge branch 'cascadedAllocator' into cascadedMalloc

merge from cascadedAllocator for coderabbitai's suggestions

Author: smithAchang

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,9 @@ assignees: ''
 
 ---
 
+<!---
 All support on github is best effort only, no guarantees given. When you need guaranteed support have a look at the commercial support offerings as listed at https://github.com/DOCGroup/ACE_TAO/wiki/ACE-and-TAO-Commercial-support.
+--->
 
 ### Version
 

ACE/ACEXML/common/InputSource.h

@@ -19,7 +19,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ACEXML/common/CharStream.h"
-#include "ace/Copy_Disabled.h"
 
 /**
  * @class ACEXML_InputSource
@@ -49,14 +48,18 @@
  *
  * @sa ACEXML_CharStream
  */
-class ACEXML_Export ACEXML_InputSource : private ACE_Copy_Disabled
+class ACEXML_Export ACEXML_InputSource
 {
 public:
   /**
    * Default constructor.
    */
   ACEXML_InputSource ();
 
+  ACEXML_InputSource (const ACEXML_InputSource &) = delete;
+  ACEXML_InputSource (ACEXML_InputSource &&) = delete;
+  ACEXML_InputSource &operator= (const ACEXML_InputSource &) = delete;
+  ACEXML_InputSource &operator= (ACEXML_InputSource &&) = delete;
 
   /**
    * Create a new input source with a ACEXML_Char stream.

ACE/ACEXML/common/LocatorImpl.h

@@ -20,7 +20,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ACEXML/common/Locator.h"
-#include "ace/Copy_Disabled.h"
 
 /**
  * @class ACEXML_LocatorImpl
@@ -58,8 +57,7 @@
  * @sa ACEXML_Locator
  */
 class ACEXML_Export ACEXML_LocatorImpl :
-  public ACEXML_Locator,
-  private ACE_Copy_Disabled
+  public ACEXML_Locator
 {
 public:
   /*
@@ -81,6 +79,11 @@ class ACEXML_Export ACEXML_LocatorImpl :
    */
   ACEXML_LocatorImpl (const ACEXML_Locator& locator);
 
+  ACEXML_LocatorImpl (const ACEXML_LocatorImpl &) = delete;
+  ACEXML_LocatorImpl (ACEXML_LocatorImpl &&) = delete;
+  ACEXML_LocatorImpl &operator= (const ACEXML_LocatorImpl &) = delete;
+  ACEXML_LocatorImpl &operator= (ACEXML_LocatorImpl &&) = delete;
+
   /*
    * Destructor.
    */

ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h

@@ -9,7 +9,6 @@
 #define DSRT_CV_DISPATCHER_IMPL_T_H
 #include /**/ "ace/pre.h"
 #include "ace/Task.h"
-#include "ace/Copy_Disabled.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +22,7 @@ namespace Kokyu
 {
   template<class DSRT_Scheduler_Traits>
   class DSRT_CV_Dispatcher_Impl :
-    public DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>,
-    public ACE_Copy_Disabled
+    public DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>
   {
   public:
     typedef typename
@@ -36,6 +34,11 @@ namespace Kokyu
     DSRT_CV_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy,
                              int sched_scope);
 
+    DSRT_CV_Dispatcher_Impl (const DSRT_CV_Dispatcher_Impl &) = delete;
+    DSRT_CV_Dispatcher_Impl (DSRT_CV_Dispatcher_Impl &&) = delete;
+    DSRT_CV_Dispatcher_Impl &operator= (const DSRT_CV_Dispatcher_Impl &) = delete;
+    DSRT_CV_Dispatcher_Impl &operator= (DSRT_CV_Dispatcher_Impl &&) = delete;
+
     int init_i (const DSRT_ConfigInfo&);
 
     /// Schedule a thread dynamically based on the qos info supplied.

ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h

@@ -15,7 +15,6 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/Copy_Disabled.h"
 #include "Kokyu_dsrt.h"
 #include "DSRT_Sched_Queue_T.h"
 #include "DSRT_Dispatcher_Impl_T.h"
@@ -25,8 +24,7 @@ namespace Kokyu
   template<class DSRT_Scheduler_Traits>
   class DSRT_Direct_Dispatcher_Impl :
     public ACE_Task_Base,
-    public DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>,
-    public ACE_Copy_Disabled
+    public DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>
   {
   public:
     typedef typename
@@ -38,6 +36,11 @@ namespace Kokyu
     DSRT_Direct_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy,
                                  int sched_scope);
 
+    DSRT_Direct_Dispatcher_Impl (const DSRT_Direct_Dispatcher_Impl &) = delete;
+    DSRT_Direct_Dispatcher_Impl (DSRT_Direct_Dispatcher_Impl &&) = delete;
+    DSRT_Direct_Dispatcher_Impl &operator= (const DSRT_Direct_Dispatcher_Impl &) = delete;
+    DSRT_Direct_Dispatcher_Impl &operator= (DSRT_Direct_Dispatcher_Impl &&) = delete;
+
     int init_i (const DSRT_ConfigInfo&);
 
     /// Schedule a thread dynamically based on the qos info supplied.

ACE/Kokyu/DSRT_Dispatch_Item_T.h

@@ -9,7 +9,6 @@
 #define DSRT_DISPATCH_ITEM_H
 #include /**/ "ace/pre.h"
 #include "ace/Bound_Ptr.h"
-#include "ace/Copy_Disabled.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,7 +25,7 @@ namespace Kokyu
    */
 
   template <class DSRT_Scheduler_Traits>
-  class DSRT_Dispatch_Item : private ACE_Copy_Disabled
+  class DSRT_Dispatch_Item
   {
     typedef typename
     DSRT_Scheduler_Traits::Guid_t Guid_t;
@@ -43,6 +42,11 @@ namespace Kokyu
   public:
     DSRT_Dispatch_Item (Guid_t guid, const DSRT_QoSDescriptor&);
 
+    DSRT_Dispatch_Item (const DSRT_Dispatch_Item &) = delete;
+    DSRT_Dispatch_Item (DSRT_Dispatch_Item &&) = delete;
+    DSRT_Dispatch_Item &operator= (const DSRT_Dispatch_Item &) = delete;
+    DSRT_Dispatch_Item &operator= (DSRT_Dispatch_Item &&) = delete;
+
     /// Get the guid.
     Guid_t guid ();
 

ACE/Kokyu/Kokyu.h

@@ -11,7 +11,6 @@
 #ifndef KOKYU_H
 #define KOKYU_H
 #include /**/ "ace/pre.h"
-#include "ace/Copy_Disabled.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -56,9 +55,15 @@ namespace Kokyu
    * Dispatcher is the class that users will be using to achieve
    * dynamic dispatching of events in an event channel.
    */
-  class Kokyu_Export Dispatcher : private ACE_Copy_Disabled
+  class Kokyu_Export Dispatcher
   {
   public:
+    Dispatcher () = default;
+    Dispatcher (const Dispatcher &) = delete;
+    Dispatcher (Dispatcher &&) = delete;
+    Dispatcher &operator= (const Dispatcher &) = delete;
+    Dispatcher &operator= (Dispatcher &&) = delete;
+
     /// Dispatch a command object based on the qos info supplied.
     int dispatch (const Dispatch_Command*, const QoSDescriptor&);
 
@@ -90,9 +95,14 @@ namespace Kokyu
    * Factory class creates a dispatcher for EC and configures the
    * interface object with the appropriate implementation.
    */
-  class Kokyu_Export Dispatcher_Factory : private ACE_Copy_Disabled
+  class Kokyu_Export Dispatcher_Factory
   {
   public:
+    Dispatcher_Factory (const Dispatcher_Factory &) = delete;
+    Dispatcher_Factory (Dispatcher_Factory &&) = delete;
+    Dispatcher_Factory &operator= (const Dispatcher_Factory &) = delete;
+    Dispatcher_Factory &operator= (Dispatcher_Factory &&) = delete;
+
     /**
       * Create a dispatcher for dynamic dispatching of commands
       * (eg. events). The caller is responsible for freeing the

ACE/Kokyu/Kokyu_dsrt.h

@@ -8,7 +8,6 @@
 #ifndef KOKYU_DSRT_H
 #define KOKYU_DSRT_H
 #include /**/ "ace/pre.h"
-#include "ace/Copy_Disabled.h"
 
 #include "kokyu_export.h"
 #include "Kokyu_defs.h"
@@ -31,7 +30,7 @@ namespace Kokyu
    * dynamic scheduling of threads.
    */
   template <class DSRT_Scheduler_Traits>
-  class DSRT_Dispatcher : private ACE_Copy_Disabled
+  class DSRT_Dispatcher
   {
   public:
     typedef typename DSRT_Scheduler_Traits::Guid_t Guid_t;
@@ -60,6 +59,13 @@ namespace Kokyu
     /// Shut down the dispatcher. The dispatcher will stop processing requests.
     int shutdown ();
 
+    DSRT_Dispatcher () = default;
+
+    DSRT_Dispatcher (const DSRT_Dispatcher &) = delete;
+    DSRT_Dispatcher (DSRT_Dispatcher &&) = delete;
+    DSRT_Dispatcher &operator= (const DSRT_Dispatcher &) = delete;
+    DSRT_Dispatcher &operator= (DSRT_Dispatcher &&) = delete;
+
     /// Non virtual destructor. Read as <b><i>this class not available
     /// for inheritance<i></b>.
     ~DSRT_Dispatcher ();
@@ -82,9 +88,14 @@ namespace Kokyu
    */
 
   template <class DSRT_Scheduler_Traits>
-  class DSRT_Dispatcher_Factory : private ACE_Copy_Disabled
+  class DSRT_Dispatcher_Factory
   {
   public:
+    DSRT_Dispatcher_Factory (const DSRT_Dispatcher_Factory &) = delete;
+    DSRT_Dispatcher_Factory (DSRT_Dispatcher_Factory &&) = delete;
+    DSRT_Dispatcher_Factory &operator= (const DSRT_Dispatcher_Factory &) = delete;
+    DSRT_Dispatcher_Factory &operator= (DSRT_Dispatcher_Factory &&) = delete;
+
     typedef std::unique_ptr<DSRT_Dispatcher<DSRT_Scheduler_Traits> > DSRT_Dispatcher_Auto_Ptr;
 
     /**

ACE/ace/Activation_Queue.h

@@ -21,7 +21,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Message_Queue.h"
-#include "ace/Copy_Disabled.h"
 #include "ace/Condition_Thread_Mutex.h"
 
 /// Define to be compatible with the terminology in the POSA2 book!

ACE/ace/Caching_Utility_T.cpp

@@ -8,7 +8,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/ACE.h"
-#include "ace/Min_Max.h"
 #include "ace/OS_Memory.h"
 #include "ace/Recyclable.h"
 
@@ -56,9 +55,9 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cac
   // Calculate the no of entries to remove from the cache depending
   // upon the <purge_percent>.
   size_t const entries_to_remove
-    = ACE_MAX (static_cast<size_t> (1),
-               static_cast<size_t> (static_cast<double> (purge_percent)
-                                    / 100 * current_map_size));
+    = (std::max) (static_cast<size_t> (1),
+                  static_cast<size_t> (static_cast<double> (purge_percent)
+                                       / 100 * current_map_size));
   KEY *key_to_remove = 0;
   VALUE *value_to_remove = 0;
 
@@ -155,9 +154,9 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT
   // Calculate the no of entries to remove from the cache depending
   // upon the <purge_percent>.
   size_t const entries_to_remove
-    = ACE_MAX (static_cast<size_t> (1),
-               static_cast<size_t> (static_cast<double> (purge_percent)
-                                    / 100 * current_map_size));
+    = (std::max) (static_cast<size_t> (1),
+                  static_cast<size_t> (static_cast<double> (purge_percent)
+                                       / 100 * current_map_size));
 
   KEY *key_to_remove = 0;
   VALUE *value_to_remove = 0;
@@ -275,9 +274,9 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATO
   // Calculate the no of entries to remove from the cache depending
   // upon the <purge_percent>.
   size_t entries_to_remove
-    = ACE_MAX (static_cast<size_t> (1),
-               static_cast<size_t> (static_cast<double> (purge_percent)
-                                    / 100 * available_entries));
+    = (std::max) (static_cast<size_t> (1),
+                  static_cast<size_t> (static_cast<double> (purge_percent)
+                                       / 100 * available_entries));
 
   if (entries_to_remove >= available_entries  || entries_to_remove == 0)
     entries_to_remove = available_entries - 1;
@@ -397,10 +396,10 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_
 
   // Calculate the no of entries to remove from the cache depending
   // upon the <purge_percent>.
-  size_t entries_to_remove
-    = ACE_MAX (static_cast<size_t> (1),
-               static_cast<size_t> (static_cast<double> (purge_percent)
-                                    / 100 * current_map_size));
+  size_t const entries_to_remove
+    = (std::max) (static_cast<size_t> (1),
+                  static_cast<size_t> (static_cast<double> (purge_percent)
+                                       / 100 * current_map_size));
 
   KEY *key_to_remove = 0;
   VALUE *value_to_remove = 0;