From db57b5f8f474973c5d9128c6444973733043215f Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Mon, 16 Jan 2012 10:11:52 +0100 Subject: [PATCH] Fix a (bogus) warning with gcc 4.4 Fix an incorrect warning: 'bm may be used uninitialized' with the old but still commonly used gcc 4.4 No functional change. Signed-off-by: Marco Costalba --- src/search.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/search.cpp b/src/search.cpp index 48cb4d6b..5440dd1e 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -249,7 +249,6 @@ void Search::think() { static Book book; // Defined static to initialize the PRNG only once - Move bm; Position& pos = RootPosition; Chess960 = pos.is_chess960(); elapsed_time(true); @@ -266,12 +265,15 @@ void Search::think() { goto finalize; } - if ( Options["OwnBook"] - && (bm = book.probe(pos, Options["Book File"], Options["Best Book Move"])) != MOVE_NONE - && count(RootMoves.begin(), RootMoves.end(), bm)) + if (Options["OwnBook"]) { - std::swap(RootMoves[0], *find(RootMoves.begin(), RootMoves.end(), bm)); - goto finalize; + Move bookMove = book.probe(pos, Options["Book File"], Options["Best Book Move"]); + + if (bookMove && count(RootMoves.begin(), RootMoves.end(), bookMove)) + { + std::swap(RootMoves[0], *find(RootMoves.begin(), RootMoves.end(), bookMove)); + goto finalize; + } } // Read UCI options: GUI could change UCI parameters during the game -- 2.39.2