Remove != test (it is causing a conflict)

sgryphon · nuclearcat · commit cd126c005494 · 2022-11-27T18:06:21.000+02:00
diff --git a/cores/esp32/IPAddress.cpp b/cores/esp32/IPAddress.cpp
@@ -114,12 +114,6 @@ bool IPAddress::operator==(const IPAddress& addr) const
         && (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0);
 }
 
-bool IPAddress::operator!=(const IPAddress& addr) const
-{
-    return (addr._type != _type)
-        || (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) != 0);
-}
-
 bool IPAddress::operator==(const uint8_t* addr) const
 {
     // IPv4 only comparison to byte pointer
diff --git a/cores/esp32/IPAddress.h b/cores/esp32/IPAddress.h
@@ -75,7 +75,6 @@ class IPAddress: public Printable
     }
 
     bool operator==(const IPAddress& addr) const;
-    bool operator!=(const IPAddress& addr) const;
     bool operator==(const uint8_t* addr) const;
 
     // Overloaded index operator to allow getting and setting individual octets of the address

Original file line number	Diff line number	Diff line change
`@@ -114,12 +114,6 @@ bool IPAddress::operator==(const IPAddress& addr) const`
`114`	`114`	`&& (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0);`
`115`	`115`	`}`
`116`	`116`
`117`		`-bool IPAddress::operator!=(const IPAddress& addr) const`
`118`		`-{`
`119`		`- return (addr._type != _type)`
`120`		`- \|\| (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) != 0);`
`121`		`-}`
`122`		`-`
`123`	`117`	`bool IPAddress::operator==(const uint8_t* addr) const`
`124`	`118`	`{`
`125`	`119`	`// IPv4 only comparison to byte pointer`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ class IPAddress: public Printable`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`bool operator==(const IPAddress& addr) const;`
`78`		`- bool operator!=(const IPAddress& addr) const;`
`79`	`78`	`bool operator==(const uint8_t* addr) const;`
`80`	`79`
`81`	`80`	`// Overloaded index operator to allow getting and setting individual octets of the address`