From e94e0edc3e6775159d37557765275a8a3887c481 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 12 Nov 2003 22:45:14 +0000 Subject: [PATCH] Fix faulty namespacification git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9943 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/Support/MallocAllocator.h | 11 +++++++---- 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 24f1a43c8d1..022953df93d 100644 --- a/include/Support/MallocAllocator.h +++ b/include/Support/MallocAllocator.h @@ -23,6 +23,8 @@ #include #include +namespace llvm { + template struct MallocAllocator { typedef size_t size_type; @@ -68,14 +70,15 @@ template inline bool operator!=(const MallocAllocator&, const MallocAllocator&) { return false; } +} // End llvm namespace namespace std { template - struct _Alloc_traits > { + struct _Alloc_traits > { static const bool _S_instanceless = true; - typedef ::MallocAllocator base_alloc_type; - typedef ::MallocAllocator _Alloc_type; - typedef ::MallocAllocator allocator_type; + typedef ::llvm::MallocAllocator base_alloc_type; + typedef ::llvm::MallocAllocator _Alloc_type; + typedef ::llvm::MallocAllocator allocator_type; }; } diff --git a/include/llvm/Support/MallocAllocator.h b/include/llvm/Support/MallocAllocator.h index 24f1a43c8d1..022953df93d 100644 --- a/include/llvm/Support/MallocAllocator.h +++ b/include/llvm/Support/MallocAllocator.h @@ -23,6 +23,8 @@ #include #include +namespace llvm { + template struct MallocAllocator { typedef size_t size_type; @@ -68,14 +70,15 @@ template inline bool operator!=(const MallocAllocator&, const MallocAllocator&) { return false; } +} // End llvm namespace namespace std { template - struct _Alloc_traits > { + struct _Alloc_traits > { static const bool _S_instanceless = true; - typedef ::MallocAllocator base_alloc_type; - typedef ::MallocAllocator _Alloc_type; - typedef ::MallocAllocator allocator_type; + typedef ::llvm::MallocAllocator base_alloc_type; + typedef ::llvm::MallocAllocator _Alloc_type; + typedef ::llvm::MallocAllocator allocator_type; }; }