Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport)
--HG-- branch : develop
This commit is contained in:
parent
57f711a41a
commit
15aed08533
1 changed files with 0 additions and 8 deletions
|
@ -945,14 +945,6 @@ inline CSString operator+(const char* s0,const CSString& s1)
|
||||||
return CSString(s0) + s1.c_str();
|
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
|
} // NLMISC
|
||||||
|
|
||||||
// *** The following was commented out by Sadge because there were strange compilation/ link issues ***
|
// *** The following was commented out by Sadge because there were strange compilation/ link issues ***
|
||||||
|
|
Loading…
Reference in a new issue