Position: fix a couple of Intel compiler warnings

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 4ab5e892079beba61af7d70a8d91610d59b54619..68f03a30ae0415803498305d0bdf880c0b6d7727 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -39,7 +39,7 @@ namespace {
 
   /// Variables
 
-  MovePicker::MovegenPhase PhaseTable[32];  
+  MovePicker::MovegenPhase PhaseTable[32];
   int MainSearchPhaseIndex;
   int EvasionsPhaseIndex;
   int QsearchWithChecksPhaseIndex;
@@ -62,7 +62,7 @@ namespace {
 /// move ordering is at the current node.
 
 MovePicker::MovePicker(const Position& p, bool pvnode, Move ttm, Move mk,
-                       Move k1, Move k2, Depth d) : pos(p) {  
+                       Move k1, Move k2, Depth d) : pos(p) {
   pvNode = pvnode;
   ttMove = ttm;
   mateKiller = (mk == ttm)? MOVE_NONE : mk;
@@ -147,13 +147,13 @@ Move MovePicker::get_next_move() {
         break;
 
     case PH_EVASIONS:
-        assert(pos.is_check());      
+        assert(pos.is_check());
         numOfMoves = generate_evasions(pos, moves);
         score_evasions();
         movesPicked = 0;
         break;
 
-    case PH_QCAPTURES:      
+    case PH_QCAPTURES:
         numOfMoves = generate_captures(pos, moves);
         score_qcaptures();
         movesPicked = 0;
@@ -172,8 +172,6 @@ Move MovePicker::get_next_move() {
         return MOVE_NONE;
     }
   }
-  assert(false);
-  return MOVE_NONE;
 }
 
 
@@ -192,7 +190,7 @@ Move MovePicker::get_next_move(Lock &lock) {
    if (m == MOVE_NONE)
        finished = true;
 
-   lock_release(&lock);   
+   lock_release(&lock);
    return m;
 }
 
@@ -273,20 +271,20 @@ void MovePicker::score_qcaptures() {
 }
 
 
-/// find_best_index() loops across the moves and returns index of\r
-/// the highest scored one.\r
-\r
-int MovePicker::find_best_index() {\r
-\r
-  int bestScore = -10000000, bestIndex = -1;\r
-\r
-  for (int i = movesPicked; i < numOfMoves; i++)\r
-      if (moves[i].score > bestScore)\r
-      {\r
-          bestIndex = i;\r
-          bestScore = moves[i].score;\r
-      }\r
-  return bestIndex;\r
+/// find_best_index() loops across the moves and returns index of
+/// the highest scored one.
+
+int MovePicker::find_best_index() {
+
+  int bestScore = -10000000, bestIndex = -1;
+
+  for (int i = movesPicked; i < numOfMoves; i++)
+      if (moves[i].score > bestScore)
+      {
+          bestIndex = i;
+          bestScore = moves[i].score;
+      }
+  return bestIndex;
 }
 
 
@@ -435,8 +433,8 @@ Move MovePicker::pick_move_from_list() {
 }
 
 
-/// MovePicker::current_move_type() returns the type of the just\r
-/// picked next move. It can be used in search to further differentiate\r
+/// MovePicker::current_move_type() returns the type of the just
+/// picked next move. It can be used in search to further differentiate
 /// according to the current move type: capture, non capture, escape, etc.
 MovePicker::MovegenPhase MovePicker::current_move_type() const {