mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/general-performance

Browse Source 
# Conflicts:
#	apps/OpenSpace/main.cpp
#	modules/server/src/topics/timetopic.cpp
This commit is contained in:
Alexander Bock
2020-09-04 13:49:00 +02:00
parent b99a4c7390 20d1e391cb
commit 00a00c9cc8
18 changed files with 289 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSpace/main.cpp
+5 -6
View File
@@ -678,22 +678,21 @@ void mainDecodeFun(const std::vector<std::byte>& data, unsigned int) {
void mainLogCallback(Log::Level level, const char* message) {
void mainLogCallback(Log::Level level, std::string_view message) {
ZoneScoped
std::string_view msg = message;
switch (level) {
case Log::Level::Debug:
LDEBUGC("SGCT", msg);
LDEBUGC("SGCT", message);
break;
case Log::Level::Info:
LINFOC("SGCT", msg);
LINFOC("SGCT", message);
break;
case Log::Level::Warning:
LWARNINGC("SGCT", msg);
LWARNINGC("SGCT", message);
break;
case Log::Level::Error:
LERRORC("SGCT", msg);
LERRORC("SGCT", message);
break;
}