Use deleted ctors in sockets.

wilx · Dec 7, 2024 · f9ccc39 · f9ccc39
1 parent e74cc5e
commit f9ccc39
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/include/log4cplus/helpers/socketbuffer.h b/include/log4cplus/helpers/socketbuffer.h
@@ -43,6 +43,8 @@ class LOG4CPLUS_EXPORT SocketBuffer
 {
 public:
     explicit SocketBuffer(std::size_t max);
+    SocketBuffer(SocketBuffer const & rhs) = delete;
+    SocketBuffer& operator= (SocketBuffer const& rhs) = delete;
     virtual ~SocketBuffer();
 
     char *getBuffer() const { return buffer; }
@@ -68,9 +70,6 @@ class LOG4CPLUS_EXPORT SocketBuffer
     std::size_t size;
     std::size_t pos;
     char *buffer;
-
-    SocketBuffer(SocketBuffer const & rhs);
-    SocketBuffer& operator= (SocketBuffer const& rhs);
 };
 
 } // end namespace helpers

diff --git a/include/log4cplus/socketappender.h b/include/log4cplus/socketappender.h
@@ -114,6 +114,9 @@ namespace log4cplus
             const log4cplus::tstring& serverName = tstring(),
             bool ipv6 = false);
         SocketAppender(const log4cplus::helpers::Properties & properties);
+        // Disallow copying of instances of this class
+        SocketAppender(const SocketAppender&) = delete;
+        SocketAppender& operator=(const SocketAppender&) = delete;
 
       // Dtor
         ~SocketAppender();
@@ -142,11 +145,6 @@ namespace log4cplus
         volatile bool connected;
         helpers::SharedObjectPtr<helpers::ConnectorThread> connector;
 #endif
-
-    private:
-      // Disallow copying of instances of this class
-        SocketAppender(const SocketAppender&);
-        SocketAppender& operator=(const SocketAppender&);
     };
 
     namespace helpers {

diff --git a/include/log4cplus/syslogappender.h b/include/log4cplus/syslogappender.h
@@ -103,6 +103,9 @@ namespace log4cplus
             int port = 514, const tstring & facility = tstring (),
             RemoteSyslogType remoteSyslogType = RSTUdp, bool ipv6 = false, bool fqdn = true);
         SysLogAppender(const log4cplus::helpers::Properties & properties);
+        // Disallow copying of instances of this class
+        SysLogAppender(const SysLogAppender&) = delete;
+        SysLogAppender& operator=(const SysLogAppender&) = delete;
 
       // Dtor
         virtual ~SysLogAppender();
@@ -150,10 +153,6 @@ namespace log4cplus
 #endif
 
     private:
-      // Disallow copying of instances of this class
-        SysLogAppender(const SysLogAppender&);
-        SysLogAppender& operator=(const SysLogAppender&);
-
         std::string identStr;
         tstring hostname;
     };