Move zobrist keys out of Position

[stockfish] / src / misc.h

diff --git a/src/misc.h b/src/misc.h
index 8d21c1adfb3d328d48768a62e26bfd012527aca1..57e86553ffa0b1686ab7c06d8e36a6ba8d75da60 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -22,6 +22,7 @@
 
 #include <fstream>
 #include <string>
+#include <vector>
 
 #include "types.h"
 
@@ -36,11 +37,6 @@ extern void dbg_hit_on_c(bool c, bool b);
 extern void dbg_mean_of(int v);
 extern void dbg_print();
 
-class Position;
-extern Move move_from_uci(const Position& pos, const std::string& str);
-extern const std::string move_to_uci(Move m, bool chess960);
-extern const std::string move_to_san(Position& pos, Move m);
-
 
 struct Log : public std::ofstream {
   Log(const std::string& f = "log.txt") : std::ofstream(f.c_str(), std::ios::out | std::ios::app) {}
@@ -48,10 +44,9 @@ struct Log : public std::ofstream {
 };
 
 
-class Time {
-public:
+struct Time {
   void restart() { system_time(&t); }
-  uint64_t msec() const { return time_to_msec(t); }
+  int64_t msec() const { return time_to_msec(t); }
   int elapsed() const { return int(current_time().msec() - time_to_msec(t)); }
 
   static Time current_time() { Time t; t.restart(); return t; }
@@ -60,4 +55,14 @@ private:
   sys_time_t t;
 };
 
+
+template<class Entry, int Size>
+struct HashTable {
+  HashTable() : e(Size, Entry()) { memset(&e[0], 0, sizeof(Entry) * Size); }
+  Entry* operator[](Key k) { return &e[(uint32_t)k & (Size - 1)]; }
+
+private:
+  std::vector<Entry> e;
+};
+
 #endif // !defined(MISC_H_INCLUDED)