Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WString: remove operator==(const __FlashStringHelper*) #8569

Merged
merged 8 commits into from
May 17, 2022
Merged

WString: remove operator==(const __FlashStringHelper*) #8569

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e15fc91
WString: overload ==
d-a-v May 16, 2022
a5cc344
keep only nullptr comparison overload
d-a-v May 16, 2022
e4b47bc
removing ==(FlashStringHelper) overload:
d-a-v May 16, 2022
a02c21c
restore the ==flashstringhelper overload, add ==decltype(NULL)
d-a-v May 16, 2022
bc52bd6
deprecate usage of NULL
d-a-v May 16, 2022
b912a70
Merge branch 'master' into streqeq
d-a-v May 17, 2022
65ad698
removing again ==(FlashStringHelper) overload
d-a-v May 17, 2022
fb666ef
revert changes about operator bool()
d-a-v May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions cores/esp8266/WString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,33 @@ class String {
bool operator ==(const __FlashStringHelper *rhs) const {
return equals(rhs);
}
bool operator ==(std::nullptr_t) const {
return length() == 0;
}
d-a-v marked this conversation as resolved.
Show resolved Hide resolved
bool operator ==(int num) const {
return equals(String(num));
}
bool operator ==(unsigned int num) const {
return equals(String(num));
}
bool operator ==(long num) const {
return equals(String(num));
}
bool operator ==(unsigned long num) const {
return equals(String(num));
}
bool operator ==(long long num) const {
return equals(String(num));
}
bool operator ==(unsigned long long num) const {
return equals(String(num));
}
bool operator ==(float num) const {
return equals(String(num));
}
bool operator ==(double num) const {
return equals(String(num));
}
bool operator !=(const String &rhs) const {
return !equals(rhs);
}
Expand All @@ -239,6 +266,33 @@ class String {
bool operator !=(const __FlashStringHelper *rhs) const {
return !equals(rhs);
}
bool operator !=(std::nullptr_t) const {
return length() != 0;
}
bool operator !=(int num) const {
return !equals(String(num));
}
bool operator !=(unsigned int num) const {
return !equals(String(num));
}
bool operator !=(long num) const {
return !equals(String(num));
}
bool operator !=(unsigned long num) const {
return !equals(String(num));
}
bool operator !=(long long num) const {
return !equals(String(num));
}
bool operator !=(unsigned long long num) const {
return !equals(String(num));
}
bool operator !=(float num) const {
return !equals(String(num));
}
bool operator !=(double num) const {
return !equals(String(num));
}
bool operator <(const String &rhs) const;
bool operator >(const String &rhs) const;
bool operator <=(const String &rhs) const;
Expand Down