diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-09-20 19:04:01 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-09-20 19:04:01 +0000 |
| commit | b87852e27691fc2a7c2226808d636ad7d9f0a30d (patch) | |
| tree | cfbec1284f62762d45c58504314912b75ea7dc4a /emulators/rpcs3/files | |
| parent | 3c1ba3c97ab788cc21a04d54b38935718b058e8c (diff) | |
Notes
Diffstat (limited to 'emulators/rpcs3/files')
| -rw-r--r-- | emulators/rpcs3/files/extra-patch-no-thread_local | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/emulators/rpcs3/files/extra-patch-no-thread_local b/emulators/rpcs3/files/extra-patch-no-thread_local index b84e4670457b..201c6b43ad6f 100644 --- a/emulators/rpcs3/files/extra-patch-no-thread_local +++ b/emulators/rpcs3/files/extra-patch-no-thread_local @@ -1,9 +1,9 @@ FreeBSD 10.3 lacks __cxa_thread_atexit, so revert https://github.com/RPCS3/rpcs3/commit/c1450ad61627 ---- Utilities/Log.cpp.orig 2017-08-24 18:20:18 UTC +--- Utilities/Log.cpp.orig 2017-09-19 12:07:07 UTC +++ Utilities/Log.cpp -@@ -246,7 +246,7 @@ void logs::message::broadcast(const char* fmt, const f +@@ -255,7 +255,7 @@ void logs::message::broadcast(const char* fmt, const f } // Get text @@ -12,16 +12,16 @@ https://github.com/RPCS3/rpcs3/commit/c1450ad61627 fmt::raw_append(text, fmt, sup, args); std::string prefix = g_tls_log_prefix(); -@@ -266,7 +266,7 @@ void logs::message::broadcast(const char* fmt, const f +@@ -275,7 +275,7 @@ void logs::message::broadcast(const char* fmt, const f } // Store message additionally -- g_messages.emplace_back(stored_message{*this, stamp, std::move(prefix), text}); -+ g_messages.emplace_back(stored_message{*this, stamp, std::move(prefix), std::move(text)}); +- get_logger()->messages.emplace_back(stored_message{*this, stamp, std::move(prefix), text}); ++ get_logger()->messages.emplace_back(stored_message{*this, stamp, std::move(prefix), std::move(text)}); } } - -@@ -348,7 +348,7 @@ logs::file_listener::file_listener(const std::string& + +@@ -405,7 +405,7 @@ logs::file_listener::file_listener(const std::string& void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::string& prefix, const std::string& _text) { |