arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Browse Source 
Conflicts:
	libraries/Ethernet/EthernetClient.cpp
This commit is contained in:
Cristian Maglie
2013-12-09 18:31:43 +01:00
parent 0516ec16a4 ffb8a557e6
commit d20c028469
4 changed files with 115 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/Ethernet/src/EthernetClient.cpp
View File

@ -162,3 +162,7 @@ uint8_t EthernetClient::status() {
EthernetClient::operator bool() {
return _sock != MAX_SOCK_NUM;
}
bool EthernetClient::operator==(const EthernetClient& rhs) {
return _sock == rhs._sock && _sock != MAX_SOCK_NUM && rhs._sock != MAX_SOCK_NUM;
}

2
libraries/Ethernet/src/EthernetClient.h
View File

@ -24,6 +24,8 @@ public:
virtual void stop();
virtual uint8_t connected();
virtual operator bool();
virtual bool operator==(const EthernetClient&);
virtual bool operator!=(const EthernetClient& rhs) { return !this->operator==(rhs); };
friend class EthernetServer;