From 9a284b4106c2d50db1c0f71043399dd8fc01e997 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 8 Jul 2012 11:54:01 +0000
Subject: [PATCH] Unordered: Remove some junk from the end of memory.hpp

[SVN r79353]
---
 test/helpers/memory.hpp          | 24 ------------------------
 test/objects/cxx11_allocator.hpp | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/test/helpers/memory.hpp b/test/helpers/memory.hpp
index 935fd315..b3638d47 100644
--- a/test/helpers/memory.hpp
+++ b/test/helpers/memory.hpp
@@ -160,30 +160,6 @@ namespace test
             test::detail::memory_tracker tracker;
         }
     }
-    
-    template <int Value>
-    struct bool_type {
-        enum { value = (Value ? true : false) };
-    };
-
-    struct true_type {
-        enum { value = true };
-    };
-
-    struct false_type {
-        enum { value = false };
-    };
-
-    struct convert_from_anything
-    {
-        template <typename T>
-        convert_from_anything(T const&) {}
-    };
-
-    int selected_count(convert_from_anything)
-    {
-        return 0;
-    }
 }
 
 #endif
diff --git a/test/objects/cxx11_allocator.hpp b/test/objects/cxx11_allocator.hpp
index c0bed76c..bd707734 100644
--- a/test/objects/cxx11_allocator.hpp
+++ b/test/objects/cxx11_allocator.hpp
@@ -293,6 +293,20 @@ namespace test
         return x.tag_ == y.tag_;
     }
 
+    // Function to check how many times an allocator has been selected,
+    // return 0 for other allocators.
+
+    struct convert_from_anything
+    {
+        template <typename T>
+        convert_from_anything(T const&) {}
+    };
+
+    inline int selected_count(convert_from_anything)
+    {
+        return 0;
+    }
+
     template <typename T, typename Flags>
     int selected_count(cxx11_allocator<T, Flags> const& x)
     {