From 2bc264c4ebe25a8aebb0d33a19b308132864fb58 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 5 Nov 2021 10:44:46 -0500 Subject: ACE_Based_Pointer is not copyable/moveable - use =delete instead of asserting - also clean up comments and style --- ACE/ace/Based_Pointer_T.cpp | 22 +++----------------- ACE/ace/Based_Pointer_T.h | 49 +++++++++++++++++---------------------------- ACE/ace/Based_Pointer_T.inl | 30 +++++++++++++-------------- 3 files changed, 36 insertions(+), 65 deletions(-) (limited to 'ACE') diff --git a/ACE/ace/Based_Pointer_T.cpp b/ACE/ace/Based_Pointer_T.cpp index e3504108156..9a1b64bd756 100644 --- a/ACE/ace/Based_Pointer_T.cpp +++ b/ACE/ace/Based_Pointer_T.cpp @@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Based_Pointer_Basic) template -ACE_Based_Pointer::ACE_Based_Pointer (void) +ACE_Based_Pointer::ACE_Based_Pointer () { ACE_TRACE ("ACE_Based_Pointer::ACE_Based_Pointer"); } @@ -44,14 +44,14 @@ ACE_Based_Pointer::ACE_Based_Pointer (CONCRETE *initial) } template -ACE_Based_Pointer::ACE_Based_Pointer (const void* base_addr, int) +ACE_Based_Pointer::ACE_Based_Pointer (const void *base_addr, int) : ACE_Based_Pointer_Basic (base_addr, 0) { ACE_TRACE ("ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic"); } template -ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic (void) +ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic () : target_ (0), base_offset_ (0) { @@ -100,22 +100,6 @@ ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic (CONCRETE *rhs) } } -template -ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic (const ACE_Based_Pointer_Basic &) -{ - ACE_TRACE ("ACE_Based_Pointer_Basic::ACE_Based_Pointer_Basic"); - - ACE_ASSERT (0); // not implemented. -} - -template -ACE_Based_Pointer::ACE_Based_Pointer (const ACE_Based_Pointer &rhs) - : ACE_Based_Pointer_Basic (rhs) -{ - ACE_TRACE ("ACE_Based_Pointer::ACE_Based_Pointer"); - ACE_ASSERT (0); // not implemented. -} - ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_BASED_POINTER_T_CPP */ diff --git a/ACE/ace/Based_Pointer_T.h b/ACE/ace/Based_Pointer_T.h index 33085713804..902e90f2a36 100644 --- a/ACE/ace/Based_Pointer_T.h +++ b/ACE/ace/Based_Pointer_T.h @@ -59,7 +59,7 @@ public: * based-pointer uses its address as an offset to it's base * address 0. */ - ACE_Based_Pointer_Basic (void); + ACE_Based_Pointer_Basic (); /** * Initialize this object using the @a initial pointer. This @@ -84,48 +84,37 @@ public: */ ACE_Based_Pointer_Basic (CONCRETE *initial); - /// Copy constructor. - ACE_Based_Pointer_Basic (const ACE_Based_Pointer_Basic &); + ACE_Based_Pointer_Basic (const ACE_Based_Pointer_Basic &) = delete; + ACE_Based_Pointer_Basic (ACE_Based_Pointer_Basic &&) = delete; /// Constructor for know base address. @a o is only used to /// resolve overload ambiguity. ACE_Based_Pointer_Basic (const void *base_addr, int o); - /// Pseudo-assignment operator. - void operator = (CONCRETE *from); + void operator= (CONCRETE *from); - /// Pseudo-assignment operator. - void operator = (const ACE_Based_Pointer_Basic &); + void operator= (const ACE_Based_Pointer_Basic &); - /// Dereference operator. CONCRETE operator * () const; - /// Less than operator. - bool operator < (const ACE_Based_Pointer_Basic &) const; + bool operator< (const ACE_Based_Pointer_Basic &) const; - /// Less than or equal operator. - bool operator <= (const ACE_Based_Pointer_Basic &) const; + bool operator<= (const ACE_Based_Pointer_Basic &) const; - /// Greater than operator. - bool operator > (const ACE_Based_Pointer_Basic &) const; + bool operator> (const ACE_Based_Pointer_Basic &) const; - /// Greater than or equal operator. - bool operator >= (const ACE_Based_Pointer_Basic &) const; + bool operator>= (const ACE_Based_Pointer_Basic &) const; - /// Equality operator. - bool operator == (const ACE_Based_Pointer_Basic &) const; + bool operator== (const ACE_Based_Pointer_Basic &) const; - /// Inequality operator. - bool operator != (const ACE_Based_Pointer_Basic &) const; + bool operator!= (const ACE_Based_Pointer_Basic &) const; - /// Subscript operator. - CONCRETE operator [](int index) const; + CONCRETE operator[] (int index) const; - /// Increment operator. void operator+= (int index); /// Returns the underlying memory address of the smart pointer. - operator CONCRETE *() const; + operator CONCRETE * () const; /// Returns the underlying memory address of the smart pointer. CONCRETE *addr () const; @@ -159,7 +148,7 @@ class ACE_Based_Pointer : public ACE_Based_Pointer_Basic public: /// Constructor. See constructor for ACE_Based_Pointer_Basic for /// details. - ACE_Based_Pointer (void); + ACE_Based_Pointer (); /// Initialize this object using the pointer. See /// constructor for ACE_Based_Pointer_Basic for details. @@ -170,17 +159,15 @@ public: /// otherwise ignored. ACE_Based_Pointer (const void *base_addr, int dummy); - /// Copy constructor (not implemented yet). - ACE_Based_Pointer (const ACE_Based_Pointer &); + ACE_Based_Pointer (const ACE_Based_Pointer &) = delete; + ACE_Based_Pointer (ACE_Based_Pointer &&) = delete; - /// Assignment operator. - void operator = (const ACE_Based_Pointer &); + void operator= (const ACE_Based_Pointer &); /// Pseudo-assignment operator. void operator = (CONCRETE *from); - /// The C++ "delegation operator". - CONCRETE *operator-> (void); + CONCRETE *operator-> (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Based_Pointer_T.inl b/ACE/ace/Based_Pointer_T.inl index c9b00d5c703..a4104dd3165 100644 --- a/ACE/ace/Based_Pointer_T.inl +++ b/ACE/ace/Based_Pointer_T.inl @@ -5,14 +5,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE CONCRETE * -ACE_Based_Pointer::operator->(void) +ACE_Based_Pointer::operator-> () { ACE_TRACE ("ACE_Based_Pointer::operator->"); return reinterpret_cast (ACE_COMPUTE_BASED_POINTER (this)); } template ACE_INLINE void -ACE_Based_Pointer_Basic::operator = (CONCRETE *rhs) +ACE_Based_Pointer_Basic::operator= (CONCRETE *rhs) { ACE_TRACE ("ACE_Based_Pointer_Basic::operator ="); if (rhs == 0) @@ -24,7 +24,7 @@ ACE_Based_Pointer_Basic::operator = (CONCRETE *rhs) } template ACE_INLINE void -ACE_Based_Pointer::operator = (CONCRETE *rhs) +ACE_Based_Pointer::operator= (CONCRETE *rhs) { ACE_TRACE ("ACE_Based_Pointer::operator ="); if (rhs == 0) @@ -36,7 +36,7 @@ ACE_Based_Pointer::operator = (CONCRETE *rhs) } template ACE_INLINE CONCRETE -ACE_Based_Pointer_Basic::operator *() const +ACE_Based_Pointer_Basic::operator * () const { ACE_TRACE ("ACE_Based_Pointer_Basic::operator *"); return *reinterpret_cast (ACE_COMPUTE_BASED_POINTER (this)); @@ -54,7 +54,7 @@ ACE_Based_Pointer_Basic::addr () const } template ACE_INLINE -ACE_Based_Pointer_Basic::operator CONCRETE *() const +ACE_Based_Pointer_Basic::operator CONCRETE * () const { ACE_TRACE ("ACE_Based_Pointer_Basic::operator CONCRETE *()"); @@ -62,7 +62,7 @@ ACE_Based_Pointer_Basic::operator CONCRETE *() const } template ACE_INLINE CONCRETE -ACE_Based_Pointer_Basic::operator [] (int index) const +ACE_Based_Pointer_Basic::operator[] (int index) const { ACE_TRACE ("ACE_Based_Pointer_Basic::operator []"); CONCRETE *c = @@ -71,63 +71,63 @@ ACE_Based_Pointer_Basic::operator [] (int index) const } template ACE_INLINE void -ACE_Based_Pointer_Basic::operator += (int index) +ACE_Based_Pointer_Basic::operator+= (int index) { ACE_TRACE ("ACE_Based_Pointer_Basic::operator +="); this->base_offset_ += (index * sizeof (CONCRETE)); } template ACE_INLINE bool -ACE_Based_Pointer_Basic::operator == (const ACE_Based_Pointer_Basic &rhs) const +ACE_Based_Pointer_Basic::operator== (const ACE_Based_Pointer_Basic &rhs) const { ACE_TRACE ("ACE_Based_Pointer_Basic::operator =="); return ACE_COMPUTE_BASED_POINTER (this) == ACE_COMPUTE_BASED_POINTER (&rhs); } template ACE_INLINE bool -ACE_Based_Pointer_Basic::operator != (const ACE_Based_Pointer_Basic &rhs) const +ACE_Based_Pointer_Basic::operator!= (const ACE_Based_Pointer_Basic &rhs) const { ACE_TRACE ("ACE_Based_Pointer_Basic::operator !="); return !(*this == rhs); } template ACE_INLINE bool -ACE_Based_Pointer_Basic::operator < (const ACE_Based_Pointer_Basic &rhs) const +ACE_Based_Pointer_Basic::operator< (const ACE_Based_Pointer_Basic &rhs) const { ACE_TRACE ("ACE_Based_Pointer_Basic::operator <"); return ACE_COMPUTE_BASED_POINTER (this) < ACE_COMPUTE_BASED_POINTER (&rhs); } template ACE_INLINE bool -ACE_Based_Pointer_Basic::operator <= (const ACE_Based_Pointer_Basic &rhs) const +ACE_Based_Pointer_Basic::operator<= (const ACE_Based_Pointer_Basic &rhs) const { ACE_TRACE ("ACE_Based_Pointer_Basic::operator <="); return ACE_COMPUTE_BASED_POINTER (this) <= ACE_COMPUTE_BASED_POINTER (&rhs); } template ACE_INLINE bool -ACE_Based_Pointer_Basic::operator > (const ACE_Based_Pointer_Basic &rhs) const +ACE_Based_Pointer_Basic::operator> (const ACE_Based_Pointer_Basic &rhs) const { ACE_TRACE ("ACE_Based_Pointer_Basic::operator >"); return ACE_COMPUTE_BASED_POINTER (this) > ACE_COMPUTE_BASED_POINTER (&rhs); } template ACE_INLINE bool -ACE_Based_Pointer_Basic::operator >= (const ACE_Based_Pointer_Basic &rhs) const +ACE_Based_Pointer_Basic::operator>= (const ACE_Based_Pointer_Basic &rhs) const { ACE_TRACE ("ACE_Based_Pointer_Basic::operator >="); return ACE_COMPUTE_BASED_POINTER (this) >= ACE_COMPUTE_BASED_POINTER (&rhs); } template ACE_INLINE void -ACE_Based_Pointer_Basic::operator= (const ACE_Based_Pointer_Basic &rhs) +ACE_Based_Pointer_Basic::operator= (const ACE_Based_Pointer_Basic &rhs) { ACE_TRACE ("ACE_Based_Pointer_Basic::operator="); *this = rhs.addr (); } template ACE_INLINE void -ACE_Based_Pointer::operator= (const ACE_Based_Pointer &rhs) +ACE_Based_Pointer::operator= (const ACE_Based_Pointer &rhs) { ACE_TRACE ("ACE_Based_Pointer::operator="); *this = rhs.addr (); -- cgit v1.2.1