Merge pull request #7587 from SeppoTakalo/fix-tpcserver-warning

Allow legacy TCPServer::accept() to override inherited Socket::accept()

features/netsocket/TCPServer.h

@@ -59,6 +59,9 @@ public:
      */
     virtual ~TCPServer();
 
+    // Allow legacy TCPServer::accept() to override inherited Socket::accept()
+    using TCPSocket::accept;
+
     /** Accepts a connection on a TCP socket
      *
      *  The server socket must be bound and set to listen for connections.