From d39f91d5d38ccc9b269702190a26fceda375d842 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 23 Jun 2017 17:20:21 +0200 Subject: [PATCH] Fixed: Compilation under GCC 4.8.4 --HG-- branch : develop --- code/nel/src/gui/http_cache.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/nel/src/gui/http_cache.cpp b/code/nel/src/gui/http_cache.cpp index acc29ca30..a032247fc 100644 --- a/code/nel/src/gui/http_cache.cpp +++ b/code/nel/src/gui/http_cache.cpp @@ -24,6 +24,11 @@ using namespace NLMISC; #define new DEBUG_NEW #endif +#if defined(GCC_VERSION) && !defined(CLANG_VERSION) && defined(NL_ISO_CPP0X_AVAILABLE) && (GCC_VERSION <= 40804) +// hack to fix std::map::erase wrong return type (void instead of iterator in C++11) in GCC 4.8.4 +#undef NL_ISO_CPP0X_AVAILABLE +#endif + namespace NLGUI { CHttpCache* CHttpCache::instance = NULL;