X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.h;h=9bf2a46834d702a4b70d4dc9a287757b8d18ea06;hp=6f1e24a4313107680c0508bd9a95722a3773af0d;hb=12e79be91039796299187ba1b2f1559552642ea4;hpb=f6f1d2422303923927c0c088dee1d6df22dc4b98

diff --git a/src/movegen.h b/src/movegen.h
index 6f1e24a4..9bf2a468 100644
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -2,6 +2,7 @@
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,6 +21,8 @@
 #ifndef MOVEGEN_H_INCLUDED
 #define MOVEGEN_H_INCLUDED
 
+#include <algorithm>
+
 #include "types.h"
 
 class Position;
@@ -35,7 +38,14 @@ enum GenType {
 
 struct ExtMove {
   Move move;
-  Value value;
+  int value;
+
+  operator Move() const { return move; }
+  void operator=(Move m) { move = m; }
+
+  // Inhibit unwanted implicit conversions to Move
+  // with an ambiguity that yields to a compile error.
+  operator float() const = delete;
 };
 
 inline bool operator<(const ExtMove& f, const ExtMove& s) {
@@ -54,9 +64,8 @@ struct MoveList {
   const ExtMove* begin() const { return moveList; }
   const ExtMove* end() const { return last; }
   size_t size() const { return last - moveList; }
-  bool contains(Move m) const {
-    for (const ExtMove& ms : *this) if (ms.move == m) return true;
-    return false;
+  bool contains(Move move) const {
+    return std::find(begin(), end(), move) != end();
   }
 
 private: