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

0xc0170 · web-flow · commit b170e1c44de4 · 2018-07-25T14:20:05.000+02:00
Allow legacy TCPServer::accept() to override inherited Socket::accept()
diff --git a/features/netsocket/TCPServer.h b/features/netsocket/TCPServer.h
@@ -59,6 +59,9 @@ class TCPServer : public TCPSocket {
      */
     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.

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ class TCPServer : public TCPSocket {`
`59`	`59`	`*/`
`60`	`60`	`virtual ~TCPServer();`
`61`	`61`
	`62`	`+ // Allow legacy TCPServer::accept() to override inherited Socket::accept()`
	`63`	`+ using TCPSocket::accept;`
	`64`	`+`
`62`	`65`	`/** Accepts a connection on a TCP socket`
`63`	`66`	`*`
`64`	`67`	`* The server socket must be bound and set to listen for connections.`