Merge pull request #769 from pennam/client_timeout

facchinm · web-flow · commit fb002d4728cc · 2024-01-09T11:39:19.000+01:00
SocketWrapper: avoid Stream setTimeout shadowing
diff --git a/libraries/SocketWrapper/src/MbedClient.cpp b/libraries/SocketWrapper/src/MbedClient.cpp
@@ -310,6 +310,6 @@ uint16_t arduino::MbedClient::remotePort() {
   return address.get_port();
 }
 
-void arduino::MbedClient::setTimeout(unsigned long timeout) {
+void arduino::MbedClient::setSocketTimeout(unsigned long timeout) {
   _timeout = timeout;
 }
diff --git a/libraries/SocketWrapper/src/MbedClient.h b/libraries/SocketWrapper/src/MbedClient.h
@@ -97,7 +97,7 @@ class MbedClient : public arduino::Client {
   IPAddress remoteIP();
   uint16_t remotePort();
 
-  void setTimeout(unsigned long timeout);
+  void setSocketTimeout(unsigned long timeout);
 
   friend class MbedServer;
   friend class MbedSSLClient;

Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,6 @@ uint16_t arduino::MbedClient::remotePort() {`
`310`	`310`	`return address.get_port();`
`311`	`311`	`}`
`312`	`312`
`313`		`-void arduino::MbedClient::setTimeout(unsigned long timeout) {`
	`313`	`+void arduino::MbedClient::setSocketTimeout(unsigned long timeout) {`
`314`	`314`	`_timeout = timeout;`
`315`	`315`	`}`