diff options
| author |  bunnei | 2014-09-11 00:04:36 -0400 |
|---|---|---|
| committer | bunnei | 2014-09-11 00:04:36 -0400 |
| commit | 532a9e80a0bd242d2937335063b719130405d6bc (patch) | |
| tree | 84fe1f054b62edc488a7a9e80eb8f79b2dd05cd0 /src/common/memory_util.cpp | |
| parent | Merge pull request #103 from archshift/prune (diff) | |
| parent | Moved common_types::Rect from common to Common namespace (diff) | |
| download | yuzu-532a9e80a0bd242d2937335063b719130405d6bc.tar.gz yuzu-532a9e80a0bd242d2937335063b719130405d6bc.tar.xz yuzu-532a9e80a0bd242d2937335063b719130405d6bc.zip | |
Merge pull request #99 from archshift/ext-check
loader.cpp: improved file extension checking, made Upper/LowerStr useful, moved string_util into Common namespace
Diffstat (limited to 'src/common/memory_util.cpp')
| -rw-r--r-- | src/common/memory_util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index 45bf5a496..bab7d9f7a 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp | |||
| @@ -187,7 +187,7 @@ std::string MemUsage() | |||
| 187 | if (NULL == hProcess) return "MemUsage Error"; | 187 | if (NULL == hProcess) return "MemUsage Error"; |
| 188 | 188 | ||
| 189 | if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc))) | 189 | if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc))) |
| 190 | Ret = StringFromFormat("%s K", ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str()); | 190 | Ret = Common::StringFromFormat("%s K", Common::ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str()); |
| 191 | 191 | ||
| 192 | CloseHandle(hProcess); | 192 | CloseHandle(hProcess); |
| 193 | return Ret; | 193 | return Ret; |