diff options
| author | bunnei <bunneidev@gmail.com> | 2018-04-27 17:09:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 17:09:56 +0200 |
| commit | acede1f1d3309e629b1ddc55ad22f920fe50f681 (patch) | |
| tree | 899731d5c75a7b40a8aa72f5e115f86e10078745 /src/common | |
| parent | Merge pull request #380 from ogniK5377/service-impl (diff) | |
| parent | general: Convert assertion macros over to be fmt-compatible (diff) | |
| download | yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.gz yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.bz2 yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.lz yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.xz yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.tar.zst yuzu-acede1f1d3309e629b1ddc55ad22f920fe50f681.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/assert.h | 5 | ||||
| -rw-r--r-- | src/common/file_util.cpp | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/common/assert.h b/src/common/assert.h index 655446f34..3ee07f6a2 100644 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -30,14 +30,15 @@ __declspec(noinline, noreturn) #define ASSERT(_a_) \ do \ if (!(_a_)) { \ - assert_noinline_call([] { LOG_CRITICAL(Debug, "Assertion Failed!"); }); \ + assert_noinline_call([] { NGLOG_CRITICAL(Debug, "Assertion Failed!"); }); \ } \ while (0) #define ASSERT_MSG(_a_, ...) \ do \ if (!(_a_)) { \ - assert_noinline_call([&] { LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); }); \ + assert_noinline_call( \ + [&] { NGLOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); }); \ } \ while (0) diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 37f9e996c..cd852bfd8 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -653,12 +653,12 @@ static const std::string GetUserDirectory(const std::string& envvar) { else if (envvar == "XDG_CACHE_HOME") subdirectory = DIR_SEP ".cache"; else - ASSERT_MSG(false, "Unknown XDG variable %s.", envvar.c_str()); + ASSERT_MSG(false, "Unknown XDG variable {}.", envvar); user_dir = GetHomeDirectory() + subdirectory; } - ASSERT_MSG(!user_dir.empty(), "User directory %s musn’t be empty.", envvar.c_str()); - ASSERT_MSG(user_dir[0] == '/', "User directory %s must be absolute.", envvar.c_str()); + ASSERT_MSG(!user_dir.empty(), "User directory {} mustn’t be empty.", envvar); + ASSERT_MSG(user_dir[0] == '/', "User directory {} must be absolute.", envvar); return user_dir; } |