diff options
| author |  bunnei | 2018-04-29 21:49:13 -0400 |
|---|---|---|
| committer |  GitHub | 2018-04-29 21:49:13 -0400 |
| commit | 81a0082f6bd4f2db9b09e56cce96351bb5084e46 (patch) | |
| tree | 4309e2b742d485f9854bbe63de4393f7e8785f5c /src/common/memory_util.cpp | |
| parent | Merge pull request #422 from bunnei/shader-mov (diff) | |
| parent | string_util: Remove StringFromFormat() and related functions (diff) | |
| download | yuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.tar.gz yuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.tar.xz yuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.zip | |
Merge pull request #424 from lioncash/string
string_util: Remove StringFromFormat() and related functions
Diffstat (limited to 'src/common/memory_util.cpp')
| -rw-r--r-- | src/common/memory_util.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index 79b7215d3..4d1ec8fb9 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp | |||
| @@ -167,8 +167,7 @@ std::string MemUsage() { | |||
| 167 | return "MemUsage Error"; | 167 | return "MemUsage Error"; |
| 168 | 168 | ||
| 169 | if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc))) | 169 | if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc))) |
| 170 | Ret = Common::StringFromFormat( | 170 | Ret = fmt::format("{} K", Common::ThousandSeparate(pmc.WorkingSetSize / 1024, 7)); |
| 171 | "%s K", Common::ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str()); | ||
| 172 | 171 | ||
| 173 | CloseHandle(hProcess); | 172 | CloseHandle(hProcess); |
| 174 | return Ret; | 173 | return Ret; |