From d54a5c49c10b984c70eda74f74745933573bb618 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sat, 6 Jul 2013 21:00:43 -0700 Subject: [PATCH] Fix warnings and errors --- modules/beast_core/beast_core.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/beast_core/beast_core.cpp b/modules/beast_core/beast_core.cpp index 5a18ba70..15bb00a5 100644 --- a/modules/beast_core/beast_core.cpp +++ b/modules/beast_core/beast_core.cpp @@ -276,6 +276,22 @@ namespace beast } +#ifdef _CRTDBG_MAP_ALLOC +#pragma pop_macro("calloc") +#pragma pop_macro("free") +#pragma pop_macro("malloc") +#pragma pop_macro("realloc") +#pragma pop_macro("_recalloc") +#pragma pop_macro("_aligned_free") +#pragma pop_macro("_aligned_malloc") +#pragma pop_macro("_aligned_offset_malloc") +#pragma pop_macro("_aligned_realloc") +#pragma pop_macro("_aligned_recalloc") +#pragma pop_macro("_aligned_offset_realloc") +#pragma pop_macro("_aligned_offset_recalloc") +#pragma pop_macro("_aligned_msize") +#endif + //------------------------------------------------------------------------------ #if BEAST_BOOST_IS_AVAILABLE