diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 02:00:39 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 02:00:39 +0000 |
commit | 7e577f73ee59f782879ba284c8d570e5cefa5431 (patch) | |
tree | 1c6e7592c7d46b093a0615458bbd6cfd2299ee9a /llvm/lib/Support/Unix/Memory.inc | |
parent | 181efbf44a53ebc946b29406b35ac6bb33e80b99 (diff) | |
download | bcm5719-llvm-7e577f73ee59f782879ba284c8d570e5cefa5431.tar.gz bcm5719-llvm-7e577f73ee59f782879ba284c8d570e5cefa5431.zip |
Don't put generic_category in the llvm namespace.
llvm-svn: 210737
Diffstat (limited to 'llvm/lib/Support/Unix/Memory.inc')
-rw-r--r-- | llvm/lib/Support/Unix/Memory.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/Support/Unix/Memory.inc b/llvm/lib/Support/Unix/Memory.inc index 5d19f59bc76..10de038f437 100644 --- a/llvm/lib/Support/Unix/Memory.inc +++ b/llvm/lib/Support/Unix/Memory.inc @@ -95,7 +95,7 @@ Memory::allocateMappedMemory(size_t NumBytes, #ifdef NEED_DEV_ZERO_FOR_MMAP static int zero_fd = open("/dev/zero", O_RDWR); if (zero_fd == -1) { - EC = error_code(errno, generic_category()); + EC = error_code(errno, std::generic_category()); return MemoryBlock(); } fd = zero_fd; @@ -123,7 +123,7 @@ Memory::allocateMappedMemory(size_t NumBytes, if (NearBlock) //Try again without a near hint return allocateMappedMemory(NumBytes, nullptr, PFlags, EC); - EC = error_code(errno, generic_category()); + EC = error_code(errno, std::generic_category()); return MemoryBlock(); } @@ -143,7 +143,7 @@ Memory::releaseMappedMemory(MemoryBlock &M) { return error_code(); if (0 != ::munmap(M.Address, M.Size)) - return error_code(errno, generic_category()); + return error_code(errno, std::generic_category()); M.Address = nullptr; M.Size = 0; @@ -157,13 +157,13 @@ Memory::protectMappedMemory(const MemoryBlock &M, unsigned Flags) { return error_code(); if (!Flags) - return error_code(EINVAL, generic_category()); + return error_code(EINVAL, std::generic_category()); int Protect = getPosixProtectionFlags(Flags); int Result = ::mprotect(M.Address, M.Size, Protect); if (Result != 0) - return error_code(errno, generic_category()); + return error_code(errno, std::generic_category()); if (Flags & MF_EXEC) Memory::InvalidateInstructionCache(M.Address, M.Size); |