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

Fix Os::Console singleton to be heapless #2896

Merged
merged 6 commits into from
Sep 25, 2024
Merged

Fix Os::Console singleton to be heapless #2896

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b6b527
Fix Os::Console singleton to be heapless
LeStarch Sep 25, 2024
34c1453
Remember your headers!
LeStarch Sep 25, 2024
469d679
Fixing parens and adding an explaination comment
LeStarch Sep 25, 2024
89268c6
Attempt function-static singleton
LeStarch Sep 25, 2024
0b05db5
Fixing spurious reference error
LeStarch Sep 25, 2024
96a8788
Fixing pointer conversion
LeStarch Sep 25, 2024
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
9 changes: 3 additions & 6 deletions Os/Console.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,9 @@ namespace Os {
}

Console& Console::getSingleton() {
// On the fly construction of singleton
if (s_singleton == nullptr) {
s_singleton = new Console();
Fw::Logger::registerLogger(s_singleton);
}
return *s_singleton;
static Console s_singleton;
Fw::Logger::registerLogger(&s_singleton);
return s_singleton;
}
}

Loading