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/mem_arena.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/mem_arena.cpp')
| -rw-r--r-- | src/common/mem_arena.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp index a456beb28..40d9c03a2 100644 --- a/src/common/mem_arena.cpp +++ b/src/common/mem_arena.cpp | |||
| @@ -139,7 +139,7 @@ void MemArena::GrabLowMemSpace(size_t size) | |||
| 139 | // a bit more. | 139 | // a bit more. |
| 140 | for (int i = 0; i < 10000; i++) | 140 | for (int i = 0; i < 10000; i++) |
| 141 | { | 141 | { |
| 142 | std::string file_name = StringFromFormat("/citramem.%d", i); | 142 | std::string file_name = Common::StringFromFormat("/citramem.%d", i); |
| 143 | fd = shm_open(file_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600); | 143 | fd = shm_open(file_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600); |
| 144 | if (fd != -1) | 144 | if (fd != -1) |
| 145 | { | 145 | { |