Silence a good bunch of Intel warnings

[stockfish] / src / tt.cpp

diff --git a/src/tt.cpp b/src/tt.cpp
index fb524e303fa3a932be953775c03a64e410c4b39a..185410e6aae307c07a211364f21800973102e202 100644 (file)
--- a/src/tt.cpp
+++ b/src/tt.cpp
@@ -108,31 +108,25 @@ void TranspositionTable::store(const Position &pos, Value v, Depth d,
   TTEntry *tte, *replace;
 
   tte = replace = first_entry(pos);
-  for (int i = 0; i < 4; i++)
+  for (int i = 0; i < 4; i++, tte++)
   {
-    if (!(tte+i)->key()) // still empty
-    {
-        *(tte+i) = TTEntry(pos.get_key(), v, type, d, m, generation);
-        writes++;
-        return;
-    }
-    if ((tte+i)->key() == pos.get_key()) // overwrite old
+    if (!tte->key() || tte->key() == pos.get_key()) // empty or overwrite old
     {
         if (m == MOVE_NONE)
-            m = (tte+i)->move();
+            m = tte->move();
 
-        *(tte+i) = TTEntry(pos.get_key(), v, type, d, m, generation);
+        *tte = TTEntry(pos.get_key(), v, type, d, m, generation);
         return;
     }
-    if (i == 0)  // replace would be a no-op in this common case
+    else if (i == 0)  // replace would be a no-op in this common case
         continue;
 
     int c1 = (replace->generation() == generation ?  2 : 0);
-    int c2 = ((tte+i)->generation() == generation ? -2 : 0);
-    int c3 = ((tte+i)->depth() < replace->depth() ?  1 : 0);
+    int c2 = (tte->generation() == generation ? -2 : 0);
+    int c3 = (tte->depth() < replace->depth() ?  1 : 0);
 
     if (c1 + c2 + c3 > 0)
-        replace = tte+i;
+        replace = tte;
   }
   *replace = TTEntry(pos.get_key(), v, type, d, m, generation);
   writes++;
@@ -183,13 +177,13 @@ void TranspositionTable::new_search() {
 
 void TranspositionTable::insert_pv(const Position &pos, Move pv[]) {
 
-  UndoInfo u;
+  StateInfo st;
   Position p(pos);
 
   for (int i = 0; pv[i] != MOVE_NONE; i++)
   {
     store(p, VALUE_NONE, Depth(0), pv[i], VALUE_TYPE_NONE);
-    p.do_move(pv[i], u);
+    p.do_move(pv[i], st);
   }
 }
 
@@ -213,7 +207,4 @@ TTEntry::TTEntry() {
 TTEntry::TTEntry(Key k, Value v, ValueType t, Depth d, Move m,
                  int generation) :
   key_ (k), data((m & 0x7FFFF) | (t << 20) | (generation << 23)),
-  value_(v), depth_(int16_t(d)) {}
-
-
-
+  value_(int16_t(v)), depth_(int16_t(d)) {}