From 23f24c50fea5a1084f7507e807b7ed227a8b6ca4 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 13 Feb 2021 18:33:28 +0100 Subject: [PATCH] Update Ghoul and remove explicit generation of ConsoleLog --- apps/OpenSpace/main.cpp | 1 - ext/ghoul | 2 +- src/engine/openspaceengine.cpp | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index 2efc3e7061..bc6c0af5d1 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -1036,7 +1036,6 @@ int main(int argc, char* argv[]) { { using namespace ghoul::logging; LogManager::initialize(LogLevel::Debug, LogManager::ImmediateFlush::Yes); - LogMgr.addLog(std::make_unique()); #ifdef WIN32 if (IsDebuggerPresent()) { LogMgr.addLog(std::make_unique()); diff --git a/ext/ghoul b/ext/ghoul index 47f7ea9533..9b7242f37b 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 47f7ea9533e23d89203fc6351bbbe310264ff0b7 +Subproject commit 9b7242f37bde8ce039ccb9f00195febb564fb79d diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 3d1d6dd868..fc7dca060a 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -71,7 +71,6 @@ #include #include #include -#include #include #include #include @@ -235,7 +234,6 @@ void OpenSpaceEngine::initialize() { using ImmediateFlush = ghoul::logging::LogManager::ImmediateFlush; ghoul::logging::LogManager::initialize(level, ImmediateFlush(immediateFlush)); - LogMgr.addLog(std::make_unique()); for (const ghoul::Dictionary& log : global::configuration->logging.logs) { try {