Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport)

This commit is contained in:
kervala 2015-12-13 14:21:20 +01:00
parent db9f889662
commit c7b54a2d27

View file

@ -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<const std::string&>(s1);
}
#endif
} // NLMISC
// *** The following was commented out by Sadge because there were strange compilation/ link issues ***