* include/bits/allocator.h (struct __alloc_neq): Add.
* include/bits/stl_list.h (list<>::_M_check_equal_allocators): Use it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129457
138bc75d-0d04-0410-961f-
82ee72b054a4
+2007-10-18 Paolo Carlini <pcarlini@suse.de>
+
+ * include/bits/allocator.h (struct __alloc_neq): Add.
+ * include/bits/stl_list.h (list<>::_M_check_equal_allocators): Use it.
+
2007-10-18 Benjamin Kosnik <bkoz@redhat.com>
* include/ext/hash_map: To...
}
};
+ // Optimize for stateless allocators.
+ template<typename _Alloc, bool = __is_empty(_Alloc)>
+ struct __alloc_neq
+ {
+ static bool
+ _S_do_it(const _Alloc&, const _Alloc&)
+ { return false; }
+ };
+
+ template<typename _Alloc>
+ struct __alloc_neq<_Alloc, false>
+ {
+ static bool
+ _S_do_it(const _Alloc& __one, const _Alloc& __two)
+ { return __one != __two; }
+ };
+
_GLIBCXX_END_NAMESPACE
#endif
void
_M_check_equal_allocators(list& __x)
{
- if (_M_get_Node_allocator() != __x._M_get_Node_allocator())
+ if (std::__alloc_neq<typename _Base::_Node_alloc_type>::
+ _S_do_it(_M_get_Node_allocator(), __x._M_get_Node_allocator()))
__throw_runtime_error(__N("list::_M_check_equal_allocators"));
}
};