libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates for fmtlib 7 

Update submodules & tracking branches
This commit is contained in:
Luke Street 2021-04-06 12:54:56 -04:00
parent c776c4a31d
commit fc3e9a51d2
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,6 +1,8 @@
[submodule "extern/lzokay"] [submodule "extern/lzokay"]
path = extern/lzokay path = extern/lzokay
url = https://github.com/jackoalan/lzokay.git url = https://github.com/jackoalan/lzokay.git
branch = master
[submodule "extern/fmt"] [submodule "extern/fmt"]
path = extern/fmt path = extern/fmt
url = https://github.com/fmtlib/fmt url = https://github.com/fmtlib/fmt
branch = master

2
extern/fmt vendored

@ -1 +1 @@
Subproject commit 9bdd1596cef1b57b9556f8bef32dc4a32322ef3e Subproject commit 95da4847274c42c110fd5bf1bf61d3f94be4a08e

2
extern/lzokay vendored

@ -1 +1 @@
Subproject commit 671e2b98642f95aaf29251367791f28e5597a0a7 Subproject commit 546a9695271e8a8b4711383f828172754fd825f2

2
include/athena/Global.hpp
View File

@ -156,7 +156,7 @@ template <typename First, typename... Rest>
constexpr auto __FIRST_ARG__(First first, Rest...) { return first; } constexpr auto __FIRST_ARG__(First first, Rest...) { return first; }
template <typename S, typename... Args> template <typename S, typename... Args>
auto __make_args_checked__(const S& format_str, Args&&... args) { auto __make_args_checked__(const S& format_str, Args&&... args) {
return fmt::internal::make_args_checked<Args...>(format_str, std::forward<Args>(args)...); return fmt::make_args_checked<Args...>(format_str, std::forward<Args>(args)...);
} }
#ifndef NDEBUG #ifndef NDEBUG

2
src/athena/Global.cpp
View File

@ -57,7 +57,7 @@ static void __defaultExceptionHandler(athena::error::Level level, const char* fi
break; break;
} }
std::string msg = fmt::internal::vformat(fmt, args); std::string msg = fmt::vformat(fmt, args);
std::cerr << levelStr << " " << file << " " << function << "(" << line << "): " << msg << std::endl; std::cerr << levelStr << " " << file << " " << function << "(" << line << "): " << msg << std::endl;
} }