fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

ASTP 1.1.0 Merge Development in Master #441

Merged
gaisser merged 265 commits from development into master 2021-06-29 14:11:46 +02:00
Conversation 0 Commits 265 Files Changed 203 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 589e64fc46 - Show all commits

2
serviceinterface/ServiceInterfaceStream.cpp
View File

@ -19,7 +19,7 @@ bool ServiceInterfaceStream::crAdditionEnabled() const {
return streambuf.crAdditionEnabled();
}
bool ServiceInterfaceStream::setAsciiColorPrefix(std::string asciiColorCode) {
void ServiceInterfaceStream::setAsciiColorPrefix(std::string asciiColorCode) {
streambuf.setAsciiColorPrefix(asciiColorCode);
}

2
serviceinterface/ServiceInterfaceStream.h
View File

@ -46,7 +46,7 @@ public:
*/
bool crAdditionEnabled() const;
bool setAsciiColorPrefix(std::string asciiColorCode);
void setAsciiColorPrefix(std::string asciiColorCode);
protected:
ServiceInterfaceBuffer streambuf;