X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=d24891d9e659f7aab9cdd7ecf16390597b54abc9;hp=a62c3a8562ebb929ccf0a4029c405ab768410f94;hb=d558f8a673b56b32ab6da8050f41b9e02fe1758b;hpb=2c097c81268e083f472bccfb47ecf56db3e3853e

diff --git a/src/main.cpp b/src/main.cpp
index a62c3a85..d24891d9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
-  Copyright (C) 2004-2020 The Stockfish developers (see AUTHORS file)
+  Copyright (C) 2004-2021 The Stockfish developers (see AUTHORS file)
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,11 +24,12 @@
 #include "bitboard.h"
 #include "endgame.h"
 #include "position.h"
+#include "psqt.h"
 #include "search.h"
+#include "syzygy/tbprobe.h"
 #include "thread.h"
 #include "tt.h"
 #include "uci.h"
-#include "syzygy/tbprobe.h"
 
 #include <grpc/grpc.h>
 #include <grpc++/server.h>
@@ -43,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,
@@ -91,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";
@@ -108,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];
@@ -128,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";
 		}
 
@@ -221,10 +223,6 @@ void HashProbeThread::Shutdown() {
 	server->Shutdown();
 }
 
-namespace PSQT {
-  void init();
-}
-
 int main(int argc, char* argv[]) {
 
   std::cout << engine_info() << std::endl;
@@ -239,7 +237,7 @@ int main(int argc, char* argv[]) {
   Endgames::init();
   Threads.set(size_t(Options["Threads"]));
   Search::clear(); // After threads are up
-  Eval::init_NNUE();
+  Eval::NNUE::init();
 
   UCI::loop(argc, argv);