AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updates for fmtlib 7 

Update submodules & tracking branches
This commit is contained in:
Luke Street 2021-04-06 12:55:23 -04:00
parent 36fc53e709
commit ca94f6974c
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hecl/.gitmodules vendored
View File

@ -1,12 +1,15 @@
[submodule "extern/libSquish"] [submodule "extern/libSquish"]
path = extern/libSquish path = extern/libSquish
url = ../libSquish.git url = ../libSquish.git
branch = master
[submodule "extern/athena"] [submodule "extern/athena"]
path = extern/athena path = extern/athena
url = ../../libAthena/athena.git url = ../../libAthena/athena.git
branch = master
[submodule "extern/boo"] [submodule "extern/boo"]
path = extern/boo path = extern/boo
url = ../boo.git url = ../boo.git
branch = master
[submodule "extern/libjpeg-turbo"] [submodule "extern/libjpeg-turbo"]
path = extern/libjpeg-turbo path = extern/libjpeg-turbo
url = ../libjpeg-turbo.git url = ../libjpeg-turbo.git

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit c776c4a31dc88ff4c3214ed90332c699a2e35362 Subproject commit fc3e9a51d2c8cf449c05b9eeb1da251ea389ea53

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit 771dbaf1aa6e7745134907cebce6f989b6b8318a Subproject commit bb6274e63815dc9b2b630a08abc2240b1990bf59

2
hecl/include/hecl/Console.hpp
View File

@ -96,7 +96,7 @@ public:
void report(Level level, const S& format, Args&&... args) { void report(Level level, const S& format, Args&&... args) {
vreport(level, fmt::to_string_view<Char>(format), vreport(level, fmt::to_string_view<Char>(format),
fmt::basic_format_args<fmt::buffer_context<Char>>( fmt::basic_format_args<fmt::buffer_context<Char>>(
fmt::internal::make_args_checked<Args...>(format, args...))); fmt::make_args_checked<Args...>(format, args...)));
} }
void init(boo::IWindow* ctx); void init(boo::IWindow* ctx);

8
hecl/lib/Console.cpp
View File

@ -385,7 +385,7 @@ void Console::handleSpecialKeyUp(boo::ESpecialKey /*sp*/, boo::EModifierKey /*mo
void Console::LogVisorAdapter::report(const char* modName, logvisor::Level severity, void Console::LogVisorAdapter::report(const char* modName, logvisor::Level severity,
fmt::string_view format, fmt::format_args args) { fmt::string_view format, fmt::format_args args) {
auto tmp = fmt::internal::vformat(format, args); auto tmp = fmt::vformat(format, args);
std::vector<std::string> lines = athena::utility::split(tmp, '\n'); std::vector<std::string> lines = athena::utility::split(tmp, '\n');
for (const std::string& line : lines) { for (const std::string& line : lines) {
auto v = fmt::format(FMT_STRING("[{}] {}"), modName, line); auto v = fmt::format(FMT_STRING("[{}] {}"), modName, line);
@ -395,7 +395,7 @@ void Console::LogVisorAdapter::report(const char* modName, logvisor::Level sever
void Console::LogVisorAdapter::report(const char* modName, logvisor::Level severity, void Console::LogVisorAdapter::report(const char* modName, logvisor::Level severity,
fmt::wstring_view format, fmt::wformat_args args) { fmt::wstring_view format, fmt::wformat_args args) {
auto tmp = fmt::internal::vformat(format, args); auto tmp = fmt::vformat(format, args);
std::vector<std::string> lines = athena::utility::split(athena::utility::wideToUtf8(tmp), '\n'); std::vector<std::string> lines = athena::utility::split(athena::utility::wideToUtf8(tmp), '\n');
for (const std::string& line : lines) { for (const std::string& line : lines) {
auto v = fmt::format(FMT_STRING("[{}] {}"), modName, line); auto v = fmt::format(FMT_STRING("[{}] {}"), modName, line);
@ -405,14 +405,14 @@ void Console::LogVisorAdapter::report(const char* modName, logvisor::Level sever
void Console::LogVisorAdapter::reportSource(const char* modName, logvisor::Level severity, const char* file, void Console::LogVisorAdapter::reportSource(const char* modName, logvisor::Level severity, const char* file,
unsigned linenum, fmt::string_view format, fmt::format_args args) { unsigned linenum, fmt::string_view format, fmt::format_args args) {
auto tmp = fmt::internal::vformat(format, args); auto tmp = fmt::vformat(format, args);
auto v = fmt::format(FMT_STRING("[{}] {} {}:{}"), modName, tmp, file, linenum); auto v = fmt::format(FMT_STRING("[{}] {} {}:{}"), modName, tmp, file, linenum);
m_con->m_log.emplace_back(std::move(v), Console::Level(severity)); m_con->m_log.emplace_back(std::move(v), Console::Level(severity));
} }
void Console::LogVisorAdapter::reportSource(const char* modName, logvisor::Level severity, const char* file, void Console::LogVisorAdapter::reportSource(const char* modName, logvisor::Level severity, const char* file,
unsigned linenum, fmt::wstring_view format, fmt::wformat_args args) { unsigned linenum, fmt::wstring_view format, fmt::wformat_args args) {
auto tmp = fmt::internal::vformat(format, args); auto tmp = fmt::vformat(format, args);
std::vector<std::string> lines = athena::utility::split(athena::utility::wideToUtf8(tmp), '\n'); std::vector<std::string> lines = athena::utility::split(athena::utility::wideToUtf8(tmp), '\n');
for (const std::string& line : lines) { for (const std::string& line : lines) {
auto v = fmt::format(FMT_STRING("[{}] {} {}:{}"), modName, line, file, linenum); auto v = fmt::format(FMT_STRING("[{}] {} {}:{}"), modName, line, file, linenum);