Merge remote-tracking branch 'upstream/master' into HEAD

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a2c741e53e2e4bd0f9bbfa458d6ceb69932a909f..d24891d9e659f7aab9cdd7ecf16390597b54abc9 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -44,6 +44,7 @@ using grpc::ServerContext;
 using grpc::Status;
 using grpc::StatusCode;
 using namespace hashprobe;
+using namespace Stockfish;
 
 Status HashProbeImpl::Probe(ServerContext* context,
                             const HashProbeRequest* request,
@@ -92,7 +93,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
                        pretty = "O-O-O";
                }
        } else if (type_of(moved_piece) == PAWN) {
-               if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+               if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) {
                        // Capture.
                        pretty = char('a' + file_of(from));
                        pretty += "x";
@@ -109,7 +110,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
                        // Remove all illegal moves to disambiguate.
                        Bitboard att_copy = attackers;
                        while (att_copy) {
-                               Square s = pop_lsb(&att_copy);
+                               Square s = pop_lsb(att_copy);
                                Move m = make_move(s, to);
                                if (!pos->pseudo_legal(m) || !pos->legal(m)) {
                                        attackers &= ~SquareBB[s];
@@ -129,7 +130,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
                        }
                }
 
-               if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+               if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) {
                        pretty += "x";
                }
 
@@ -222,12 +223,6 @@ void HashProbeThread::Shutdown() {
        server->Shutdown();
 }
 
-namespace PSQT {
-  void init();
-}
-
-using namespace Stockfish;
-
 int main(int argc, char* argv[]) {
 
   std::cout << engine_info() << std::endl;