From 0bab2cc658c9caa25566e9b02e1c46fdd6ee258c Mon Sep 17 00:00:00 2001 From: Glen Fernandes Date: Fri, 25 Jul 2014 20:33:29 -0700 Subject: [PATCH] Rename member because _CRTDBG_MAP_ALLOC in VS does not allow it _CRTDBG_MAP_ALLOC has issues with member functions named "free". --- include/boost/smart_ptr/detail/array_allocator.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/smart_ptr/detail/array_allocator.hpp b/include/boost/smart_ptr/detail/array_allocator.hpp index fb8e662..4f9dc2b 100644 --- a/include/boost/smart_ptr/detail/array_allocator.hpp +++ b/include/boost/smart_ptr/detail/array_allocator.hpp @@ -166,12 +166,12 @@ namespace boost { void operator()() { if (data.object) { R tag; - free(tag); + release(tag); } } private: - void free(ms_init_tag) { + void release(ms_init_tag) { #if !defined(BOOST_NO_CXX11_ALLOCATOR) as_destroy(allocator(), data.object, data.size); #else @@ -179,7 +179,7 @@ namespace boost { #endif } - void free(ms_noinit_tag) { + void release(ms_noinit_tag) { ms_destroy(data.object, data.size); }