From c7b54a2d278596948350e62420bb9a7932a97b17 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 13 Dec 2015 14:21:20 +0100 Subject: [PATCH] Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport) --- code/nel/include/nel/misc/sstring.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/nel/include/nel/misc/sstring.h b/code/nel/include/nel/misc/sstring.h index c9ebff721..a8b231012 100644 --- a/code/nel/include/nel/misc/sstring.h +++ b/code/nel/include/nel/misc/sstring.h @@ -945,14 +945,6 @@ inline CSString operator+(const char* s0,const CSString& s1) return CSString(s0) + s1.c_str(); } -#if !defined(NL_COMP_VC) || (NL_COMP_VC_VERSION <= 100) -// TODO: check if it can be disabled for other compilers too -inline CSString operator+(const std::string& s0,const CSString& s1) -{ - return s0+static_cast(s1); -} -#endif - } // NLMISC // *** The following was commented out by Sadge because there were strange compilation/ link issues ***