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 - 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 - 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 + convert_from_anything(T const&) {} + }; + + inline int selected_count(convert_from_anything) + { + return 0; + } + template int selected_count(cxx11_allocator const& x) {