git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Standard Gaming Platform/stringicmp.cpp

@@ -12,6 +12,7 @@ bool TStringiLess::operator() (std::string const& s1, std::string const& s2) con
 	// An MSVC compliance issue...
 	//using std::toupper;
 
+#if 0
 	std::string::const_iterator p1 = s1.begin();
 	std::string::const_iterator p2 = s2.begin();
 
@@ -24,4 +25,18 @@ bool TStringiLess::operator() (std::string const& s1, std::string const& s2) con
 	if (p2 == s2.end()) return false;
 
 	return toupper(*p1) < toupper(*p2);
+#else
+	const char *p1 = s1.c_str();
+	const char *p2 = s2.c_str();
+
+	while (*p1 && *p2 && toupper(*p1) == toupper(*p2)) {
+		++p1;
+		++p2;
+	}
+
+	if (!*p1) return *p2;
+	if (!*p2) return false;
+
+	return toupper(*p1) < toupper(*p2);
+#endif
 }