Revert "Catch fmt::print throwing std::system_error when it cannot wr…

…ite to STDOUT (fixes nba-emu#301)" This reverts commit ff8f402.
GranMinigun · Dec 8, 2023 · 0b5a2f7 · 0b5a2f7
1 parent 470f1f4
commit 0b5a2f7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 30 deletions.
diff --git a/src/nba/CMakeLists.txt b/src/nba/CMakeLists.txt
@@ -114,7 +114,6 @@ set(HEADERS_PUBLIC
   include/nba/core.hpp
   include/nba/integer.hpp
   include/nba/log.hpp
-  include/nba/print.hpp
   include/nba/save_state.hpp
   include/nba/scheduler.hpp
 )

diff --git a/src/nba/include/nba/log.hpp b/src/nba/include/nba/log.hpp
@@ -11,7 +11,6 @@
 #include <fmt/format.h>
 #include <string_view>
 #include <utility>
-#include <nba/print.hpp>
 
 namespace nba {
 
@@ -48,7 +47,7 @@ inline void Log(std::string_view format, Args&&... args) {
     if constexpr(level == Error) prefix = "\e[35m[E]";
     if constexpr(level == Fatal) prefix = "\e[31m[F]";
 
-    nba::print("{} {}\n", prefix, fmt::format(format, std::forward<Args>(args)...));
+    fmt::print("{} {}\n", prefix, fmt::format(format, std::forward<Args>(args)...));
   }
 }
 

diff --git a/src/nba/include/nba/print.hpp b/src/nba/include/nba/print.hpp
diff --git a/src/nba/src/bus/io.cpp b/src/nba/src/bus/io.cpp
@@ -633,7 +633,7 @@ void Bus::Hardware::WriteHalf(u32 address, u16 value) {
 
     case MGBA_LOG_SEND: {
       if(mgba_log.enable && (value & 0x100) != 0) {
-        nba::print("mGBA log: {}\n", mgba_log.message.data());
+        fmt::print("mGBA log: {}\n", mgba_log.message.data());
         std::fflush(stdout);
         mgba_log.message.fill(0);
       }