X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=9e718c02c89ca8a5670b555ed05ccca93fb9026a;hp=1dfc474a9c0a3098ce82e0aa181dfb1bfa89195a;hb=44c78fdb7ad4c82656f25e4da11f3f9d56a4c6aa;hpb=ff1ecb5d6c58b665efc9df6779c05b9e7a61d603 diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 1dfc474a..9e718c02 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -17,6 +17,7 @@ along with this program. If not, see . */ +#include #include #include #include @@ -33,20 +34,10 @@ OptionsMap Options; // Global object // Our case insensitive less() function as required by UCI protocol -bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const { - - int c1, c2; - size_t i = 0; - - while (i < s1.size() && i < s2.size()) - { - c1 = tolower(s1[i]); - c2 = tolower(s2[i++]); +static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); } - if (c1 != c2) - return c1 < c2; - } - return s1.size() < s2.size(); +bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const { + return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less); }