Added -Wshadow option and fixed resulting warnings

[stockfish] / src / book.h

diff --git a/src/book.h b/src/book.h
index 53c8a7e1be01b81c6caaa46efbd0ef2365ac2500..55d212a88634b03e00ebad286ad2f5a3aa868b4f 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();
@@ -60,14 +58,15 @@ private:
   BookEntry read_entry(int idx);
   int find_entry(uint64_t key);
 
+  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(); }
+template<int n> inline uint64_t Book::get_int() { return 256 * get_int<n-1>() + bookFile.get(); }
+template<> inline uint64_t Book::get_int<1>() { return bookFile.get(); }
 
 
 #endif // !defined(BOOK_H_INCLUDED)