From 939b621e5c67e9ef89b409fd773d38058341906c Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sun, 18 Dec 2011 20:48:59 +0100 Subject: [PATCH] Use ADL to skip std:: qualifier Take advantage of argument-dependent lookup (ADL) to avoid specifying std:: qualifier in some STL functions. When a function argument refers to a namespace (in this case std) then the compiler will search the unqualified function in that namespace too. No functional change. Signed-off-by: Marco Costalba --- src/search.cpp | 12 ++++++------ src/ucioption.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/search.cpp b/src/search.cpp index ae247c04..9393db65 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -291,7 +291,7 @@ void Search::think() { // is given, with the subset of legal moves to search. for (MoveList ml(pos); !ml.end(); ++ml) if ( SearchMoves.empty() - || std::count(SearchMoves.begin(), SearchMoves.end(), ml.move())) + || count(SearchMoves.begin(), SearchMoves.end(), ml.move())) RootMoves.push_back(RootMove(ml.move())); if (Options["OwnBook"].value()) @@ -302,9 +302,9 @@ void Search::think() { Move bookMove = book.probe(pos, Options["Best Book Move"].value()); if ( bookMove != MOVE_NONE - && std::count(RootMoves.begin(), RootMoves.end(), bookMove)) + && count(RootMoves.begin(), RootMoves.end(), bookMove)) { - std::swap(RootMoves[0], *std::find(RootMoves.begin(), RootMoves.end(), bookMove)); + std::swap(RootMoves[0], *find(RootMoves.begin(), RootMoves.end(), bookMove)); goto finish; } } @@ -568,7 +568,7 @@ namespace { if (skillBest == MOVE_NONE) // Still unassigned ? skillBest = do_skill_level(); - std::swap(RootMoves[0], *std::find(RootMoves.begin(), RootMoves.end(), skillBest)); + std::swap(RootMoves[0], *find(RootMoves.begin(), RootMoves.end(), skillBest)); } } @@ -877,7 +877,7 @@ split_point_start: // At split points actual search starts from here // At root obey the "searchmoves" option and skip moves not listed in Root // Move List, as a consequence any illegal move is also skipped. In MultiPV // mode we also skip PV moves which have been already searched. - if (RootNode && !std::count(RootMoves.begin() + PVIdx, RootMoves.end(), move)) + if (RootNode && !count(RootMoves.begin() + PVIdx, RootMoves.end(), move)) continue; // At PV and SpNode nodes we want all moves to be legal since the beginning @@ -1060,7 +1060,7 @@ split_point_start: // At split points actual search starts from here // be trusted, and we don't update the best move and/or PV. if (RootNode && !Signals.stop) { - RootMove& rm = *std::find(RootMoves.begin(), RootMoves.end(), move); + RootMove& rm = *find(RootMoves.begin(), RootMoves.end(), move); rm.nodes += pos.nodes_searched() - nodes; // PV move or new best move ? diff --git a/src/ucioption.cpp b/src/ucioption.cpp index f91dd3fe..7b8799c4 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -33,7 +33,7 @@ OptionsMap Options; // Global object static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); } bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const { - return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less); + return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less); } -- 2.39.2