From bfbab6ed7f641f62ba53093a9ae205970039e2b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Mon, 9 Aug 2021 00:59:57 +0200 Subject: [PATCH] Fixes #186 ("Warnings out the wazoo") --- doc/container.qbk | 1 + src/dlmalloc_ext_2_8_6.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/container.qbk b/doc/container.qbk index 9bf5e04..41956b0 100644 --- a/doc/container.qbk +++ b/doc/container.qbk @@ -1341,6 +1341,7 @@ use [*Boost.Container]? There are several reasons for that: [section:release_notes_boost_1_78_00 Boost 1.78 Release] * Fixed bugs/issues: + * [@https://github.com/boostorg/container/issues/186 GitHub #186: ['"Warnings out the wazoo"]]. * [@https://github.com/boostorg/container/issues/187 GitHub #187: ['"flat_map::erase and unique keys"]]. * [@https://github.com/boostorg/container/issues/188 GitHub #188: ['"Build fails when RTTI is disabled"]]. diff --git a/src/dlmalloc_ext_2_8_6.c b/src/dlmalloc_ext_2_8_6.c index 0b0101c..2bdd3af 100644 --- a/src/dlmalloc_ext_2_8_6.c +++ b/src/dlmalloc_ext_2_8_6.c @@ -35,7 +35,6 @@ #ifdef __GNUC__ #define FORCEINLINE inline #endif -#include "dlmalloc_2_8_6.c" #ifdef _MSC_VER #pragma warning (push) @@ -45,8 +44,13 @@ #pragma warning (disable : 4702) #pragma warning (disable : 4390) /*empty controlled statement found; is this the intent?*/ #pragma warning (disable : 4251 4231 4660) /*dll warnings*/ +#pragma warning (disable : 4057) /*differs in indirection to slightly different base types from*/ +#pragma warning (disable : 4702) /*unreachable code*/ +#pragma warning (disable : 4127) /*conditional expression is constant*/ #endif +#include "dlmalloc_2_8_6.c" + #define DL_SIZE_IMPL(p) (chunksize(mem2chunk(p)) - overhead_for(mem2chunk(p))) static size_t s_allocated_memory;