diff options
| author | bunnei <bunneidev@gmail.com> | 2014-09-11 00:04:36 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-09-11 00:04:36 -0400 |
| commit | 532a9e80a0bd242d2937335063b719130405d6bc (patch) | |
| tree | 84fe1f054b62edc488a7a9e80eb8f79b2dd05cd0 /src/common/memory_util.cpp | |
| parent | d79fe3ebaadbc19e8ffe5075bad51a9735aafb38 (diff) | |
| parent | 8fe5f2e2fe33ccde39bc79898052a8f679222964 (diff) | |
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 45bf5a4967..bab7d9f7aa 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp @@ -187,7 +187,7 @@ std::string MemUsage() if (NULL == hProcess) return "MemUsage Error"; if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc))) - Ret = StringFromFormat("%s K", ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str()); + Ret = Common::StringFromFormat("%s K", Common::ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str()); CloseHandle(hProcess); return Ret; |