summaryrefslogtreecommitdiff
path: root/Source/Core/Common/MemoryUtil.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2016-08-19 11:04:45 +0200
committerGitHub <noreply@github.com>2016-08-19 11:04:45 +0200
commit31c530c7b3043a0673d8ec8694169d1accbb732f (patch)
tree54d3b015e71bb65e1134844c4313ae45b4155612 /Source/Core/Common/MemoryUtil.cpp
parent40f4308dc2120ce4e105008f3cb46b6a1c553e64 (diff)
parentfbc0aaf79672cd20c580a28ba765e4a07c2c8c67 (diff)
Merge pull request #3386 from lioncash/memory
Common: Namespace MemoryUtil
Diffstat (limited to 'Source/Core/Common/MemoryUtil.cpp')
-rw-r--r--Source/Core/Common/MemoryUtil.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp
index 1941f8e35b..ce0d38cbcb 100644
--- a/Source/Core/Common/MemoryUtil.cpp
+++ b/Source/Core/Common/MemoryUtil.cpp
@@ -31,6 +31,9 @@
// Uncomment the following line to be able to run Dolphin in Valgrind.
//#undef MAP_32BIT
+namespace Common
+{
+
#if !defined(_WIN32)
#include <unistd.h>
static uintptr_t RoundPage(uintptr_t addr)
@@ -273,3 +276,5 @@ size_t MemPhysical()
return (size_t)memInfo.totalram * memInfo.mem_unit;
#endif
}
+
+} // namespace Common