Fixed: Compilation with VC++ 2010 without STLport

This commit is contained in:
kervala 2011-05-29 17:55:18 +02:00
parent b2585e21f6
commit ce09bea89d

View file

@ -945,10 +945,13 @@ inline CSString operator+(const char* s0,const CSString& s1)
return CSString(s0)+s1;
}
#ifndef NL_COMP_VC10
// 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 // NL_COMP_VC10
} // NLMISC