From 5d35aec80fd8c96181c7b0fb4c543fe18c6ee9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Sat, 13 Jun 2015 16:44:46 +0200 Subject: [PATCH] Fixed Trac #11339 ("VC12 LNK2005 error with boost::container::adaptive_pool") --- doc/container.qbk | 1 + src/dlmalloc_ext_2_8_6.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/container.qbk b/doc/container.qbk index 476ca7c..b86deb8 100644 --- a/doc/container.qbk +++ b/doc/container.qbk @@ -1102,6 +1102,7 @@ use [*Boost.Container]? There are several reasons for that: * [@https://github.com/boostorg/container/pull/27 GitHub #27: ['fix stable_vector's index_of's doxygen comment]]. Thanks to kariya-mitsuru. * [@https://svn.boost.org/trac/boost/ticket/11380 Trac #11380: ['"Container library std forward declarations incorrect in std_fwd.hpp on libc++ with gcc"]]. * [@https://svn.boost.org/trac/boost/ticket/11388 Trac #11388: ['"boost::container::list::emplace_back broken on Visual Studio 2010"]]. +* [@https://svn.boost.org/trac/boost/ticket/11339 Trac #11339: ['"VC12 LNK2005 error with boost::container::adaptive_pool"]]. [endsect] diff --git a/src/dlmalloc_ext_2_8_6.c b/src/dlmalloc_ext_2_8_6.c index c3e91f8..4896dfb 100644 --- a/src/dlmalloc_ext_2_8_6.c +++ b/src/dlmalloc_ext_2_8_6.c @@ -31,7 +31,10 @@ #endif #define USE_DL_PREFIX -#define FORCEINLINE + +#ifdef __GNUC__ +#define FORCEINLINE inline +#endif #include "dlmalloc_2_8_6.c" #ifdef _MSC_VER