diff options
| -rw-r--r-- | include/Support/MallocAllocator.h | 11 | ||||
| -rw-r--r-- | include/llvm/Support/MallocAllocator.h | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/include/Support/MallocAllocator.h b/include/Support/MallocAllocator.h index 24f1a43c8d..022953df93 100644 --- a/include/Support/MallocAllocator.h +++ b/include/Support/MallocAllocator.h @@ -23,6 +23,8 @@ #include <cstdlib> #include <memory> +namespace llvm { + template<typename T> struct MallocAllocator { typedef size_t size_type; @@ -68,14 +70,15 @@ template<typename T> inline bool operator!=(const MallocAllocator<T>&, const MallocAllocator<T>&) { return false; } +} // End llvm namespace namespace std { template<typename Type, typename Type2> - struct _Alloc_traits<Type, ::MallocAllocator<Type2> > { + struct _Alloc_traits<Type, ::llvm::MallocAllocator<Type2> > { static const bool _S_instanceless = true; - typedef ::MallocAllocator<Type> base_alloc_type; - typedef ::MallocAllocator<Type> _Alloc_type; - typedef ::MallocAllocator<Type> allocator_type; + typedef ::llvm::MallocAllocator<Type> base_alloc_type; + typedef ::llvm::MallocAllocator<Type> _Alloc_type; + typedef ::llvm::MallocAllocator<Type> allocator_type; }; } diff --git a/include/llvm/Support/MallocAllocator.h b/include/llvm/Support/MallocAllocator.h index 24f1a43c8d..022953df93 100644 --- a/include/llvm/Support/MallocAllocator.h +++ b/include/llvm/Support/MallocAllocator.h @@ -23,6 +23,8 @@ #include <cstdlib> #include <memory> +namespace llvm { + template<typename T> struct MallocAllocator { typedef size_t size_type; @@ -68,14 +70,15 @@ template<typename T> inline bool operator!=(const MallocAllocator<T>&, const MallocAllocator<T>&) { return false; } +} // End llvm namespace namespace std { template<typename Type, typename Type2> - struct _Alloc_traits<Type, ::MallocAllocator<Type2> > { + struct _Alloc_traits<Type, ::llvm::MallocAllocator<Type2> > { static const bool _S_instanceless = true; - typedef ::MallocAllocator<Type> base_alloc_type; - typedef ::MallocAllocator<Type> _Alloc_type; - typedef ::MallocAllocator<Type> allocator_type; + typedef ::llvm::MallocAllocator<Type> base_alloc_type; + typedef ::llvm::MallocAllocator<Type> _Alloc_type; + typedef ::llvm::MallocAllocator<Type> allocator_type; }; } |