Fix pretty_pv() output in Chess960

[stockfish] / src / book.h

diff --git a/src/book.h b/src/book.h
index 53c8a7e1be01b81c6caaa46efbd0ef2365ac2500..07c00b4585ebea54e2337a8f8a4c22abe0b36416 100644 (file)
--- a/src/book.h
+++ b/src/book.h
@@ -38,9 +38,7 @@ struct BookEntry {
   uint32_t learn;
 };
 
-class Book : private std::ifstream {
-  Book(const Book&); // just decleared..
-  Book& operator=(const Book&); // ..to avoid a warning
+class Book {
 public:
   Book();
   ~Book();
@@ -50,24 +48,15 @@ public:
   const std::string name() const { return bookName; }
 
 private:
-  // read n chars from the file stream and converts them in an
-  // integer number. Integers are stored with highest byte first.
-  template<int n> uint64_t get_int();
-
-  template<typename T>
-  Book& operator>>(T& n) { n = (T)get_int<sizeof(T)>(); return *this; }
+  template<typename T> Book& operator>>(T& n);
 
   BookEntry read_entry(int idx);
-  int find_entry(uint64_t key);
+  int first_entry(uint64_t key);
 
+  RKISS RKiss;
+  std::ifstream bookFile;
   std::string bookName;
   int bookSize;
-  RKISS RKiss;
 };
 
-// Yes, we indulge a bit here ;-)
-template<int n> inline uint64_t Book::get_int() { return 256 * get_int<n-1>() + get(); }
-template<> inline uint64_t Book::get_int<1>() { return get(); }
-
-
 #endif // !defined(BOOK_H_INCLUDED)