feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Rename member because _CRTDBG_MAP_ALLOC in VS does not allow it

Browse Source 
_CRTDBG_MAP_ALLOC has issues with member functions named "free".
This commit is contained in:
Glen Fernandes
2014-07-25 20:33:29 -07:00
parent d28b0d07fc
commit 0bab2cc658
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/smart_ptr/detail/array_allocator.hpp
View File

@ -166,12 +166,12 @@ namespace boost {
void operator()() { void operator()() {
if (data.object) { if (data.object) {
R tag; R tag;
free(tag); release(tag);
} }
} }
private: private:
void free(ms_init_tag) { void release(ms_init_tag) {
#if !defined(BOOST_NO_CXX11_ALLOCATOR) #if !defined(BOOST_NO_CXX11_ALLOCATOR)
as_destroy(allocator(), data.object, data.size); as_destroy(allocator(), data.object, data.size);
#else #else
@ -179,7 +179,7 @@ namespace boost {
#endif #endif
} }
void free(ms_noinit_tag) { void release(ms_noinit_tag) {
ms_destroy(data.object, data.size); ms_destroy(data.object, data.size);
} }