From ce09bea89d3a4db6287fa23d7f5fb9324b1f9519 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sun, 29 May 2011 17:55:18 +0200
Subject: [PATCH] Fixed: Compilation with VC++ 2010 without STLport

---
 code/nel/include/nel/misc/sstring.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/nel/include/nel/misc/sstring.h b/code/nel/include/nel/misc/sstring.h
index 7b4fa717d..513c681c9 100644
--- a/code/nel/include/nel/misc/sstring.h
+++ b/code/nel/include/nel/misc/sstring.h
@@ -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