From 390ee1476a36465d8d70cdf5e315c8007fd3e357 Mon Sep 17 00:00:00 2001 From: Chad Elliott Date: Tue, 6 Dec 2022 08:12:41 -0600 Subject: Added assignment operators because a copy constructor was defined. (ubuntu 22 - gcc 11 warning) --- ACE/ace/SString.h | 3 +++ ACE/ace/SString.inl | 7 +++++++ ACE/ace/UNIX_Addr.h | 3 +++ ACE/ace/UNIX_Addr.inl | 7 +++++++ 4 files changed, 20 insertions(+) diff --git a/ACE/ace/SString.h b/ACE/ace/SString.h index 1f4f6749e83..f421a509868 100644 --- a/ACE/ace/SString.h +++ b/ACE/ace/SString.h @@ -93,6 +93,9 @@ public: /// Constructor that copies @a c into dynamically allocated memory. ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc = 0); + /// Assignment operator (does copy memory). + ACE_NS_WString &operator = (const ACE_NS_WString &rhs); + /// Transform into a copy of the ASCII character representation. /// (caller must delete) char *char_rep (void) const; diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl index c5685c0905b..11441def011 100644 --- a/ACE/ace/SString.inl +++ b/ACE/ace/SString.inl @@ -49,6 +49,13 @@ ACE_NS_WString::ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc) { } +ACE_INLINE ACE_NS_WString & +ACE_NS_WString::operator = (const ACE_NS_WString &rhs) +{ + ACE_WString::operator = (rhs); + return *this; +} + ACE_INLINE ACE_NS_WString operator+ (const ACE_NS_WString &s, const ACE_NS_WString &t) { diff --git a/ACE/ace/UNIX_Addr.h b/ACE/ace/UNIX_Addr.h index d0851feb3ba..7473aab03e9 100644 --- a/ACE/ace/UNIX_Addr.h +++ b/ACE/ace/UNIX_Addr.h @@ -49,6 +49,9 @@ public: /// Creates an ACE_INET_Addr from a sockaddr_un structure. ACE_UNIX_Addr (const sockaddr_un *, int len); + /// Assignment operator + ACE_UNIX_Addr &operator = (const ACE_UNIX_Addr &rhs); + /// Creates an ACE_UNIX_Addr from another ACE_UNIX_Addr. int set (const ACE_UNIX_Addr &sa); diff --git a/ACE/ace/UNIX_Addr.inl b/ACE/ace/UNIX_Addr.inl index f19ef68a52b..fdf9dc5a287 100644 --- a/ACE/ace/UNIX_Addr.inl +++ b/ACE/ace/UNIX_Addr.inl @@ -23,6 +23,13 @@ ACE_UNIX_Addr::set (const wchar_t rendezvous_point[]) } #endif /* ACE_HAS_WCHAR */ +ACE_INLINE ACE_UNIX_Addr & +ACE_UNIX_Addr::operator = (const ACE_UNIX_Addr &rhs) +{ + this->set (rhs); + return *this; +} + // Compare two addresses for equality. ACE_INLINE bool -- cgit v1.2.1