Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9c47a1c
wip
mcspr Dec 19, 2020
d1d584e
huh, turns out String = 'c' did some weird stuff
mcspr Dec 19, 2020
c9a55f7
style
mcspr Dec 22, 2020
7a9cf16
Merge remote-tracking branch 'origin/master' into string/no-sum-helper
mcspr Dec 22, 2020
14e1e7c
allow "blah" + String, 'c' + String and F("...") + String
mcspr Dec 22, 2020
559a5db
shuffle things into .cpp
mcspr Dec 22, 2020
6dbcfa9
trying to fix arduinojson
mcspr Dec 22, 2020
4683923
fix accidental realloc, add test for operator+
mcspr Dec 23, 2020
6a3fc86
fixup! fix accidental realloc, add test for operator+
mcspr Dec 23, 2020
52c8b37
don't need another branch
mcspr Dec 23, 2020
5c35ae3
template +=(String / char* / numbers) and +(String, numbers / char*)
mcspr Dec 23, 2020
c908321
Merge remote-tracking branch 'origin/master' into string/no-sum-helper
mcspr Dec 23, 2020
425b366
Merge remote-tracking branch 'origin/master' into string/no-sum-helper
mcspr Jan 5, 2021
e553e26
nul after moving (isnt mem always zeroed tho?)
mcspr Jan 6, 2021
73a28d0
check if lhs cant keep before switching to rhs
mcspr Jan 6, 2021
fa00fba
fix String used to store struct data
mcspr Jan 6, 2021
8af5a00
style once more
mcspr Jan 6, 2021
c57ae69
typo
mcspr Jan 6, 2021
ed60441
Merge branch 'master' into string/no-sum-helper
earlephilhower Jan 8, 2021
4b70ead
Merge branch 'master' into string/no-sum-helper
earlephilhower Jan 9, 2021
b4ec910
Merge remote-tracking branch 'origin/master' into string/no-sum-helper
mcspr Jan 27, 2021
95ebd47
Merge remote-tracking branch 'origin/master' into string/no-sum-helper
mcspr Mar 21, 2021
3299833
recover 444002180bca8e36b3014eaf5ecf5e690837b440
mcspr Mar 21, 2021
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
typo
  • Loading branch information
mcspr committed Jan 6, 2021
commit c57ae6968fc6175546fa9ee157416c46c509c20d
2 changes: 1 addition & 1 deletion cores/esp8266/WString.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class String {
String &operator =(const __FlashStringHelper *str);
String &operator =(String &&rval) noexcept;
String &operator =(char c) {
char buf[2] { c, '\0' };
char buffer[2] { c, '\0' };
*this = buffer;
return *this;
}
Expand Down