Merge branch 'master' into switch

# Conflicts: # src/engine/logging.cpp # src/engine/logging.h
dimag0g · Feb 16, 2021 · 766dce8 · 766dce8
2 parents d34ae3f + e4880fa
commit 766dce8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/engine/logging.cpp b/src/engine/logging.cpp
@@ -31,7 +31,7 @@ namespace Logging
 #if defined( __SWITCH__ ) // Platforms which log to file
     std::ofstream logFile;
 #endif
-	
+
     const char * GetDebugOptionName( const int name )
     {
         if ( name & DBG_ENGINE )

diff --git a/src/engine/logging.h b/src/engine/logging.h
@@ -100,8 +100,8 @@ namespace Logging
 }
 #define COUT( x )                                                                                                                                                        \
     {                                                                                                                                                                    \
-        Logging::logFile << x << std::endl;                                                                                                                                      \
-        Logging::logFile.flush();                                                                                                                                                \
+        Logging::logFile << x << std::endl;                                                                                                                              \
+        Logging::logFile.flush();                                                                                                                                        \
     }
 #else // Default: log to STDERR
 #define COUT( x )                                                                                                                                                        \