From 1530ae4f5ff59cfd30f6f933e4dc05ea89cca8fc Mon Sep 17 00:00:00 2001 From: Kenneth Heafield Date: Wed, 9 Jan 2013 13:15:04 +0000 Subject: Fix state comparison (impacted 32-bit) --- lm/state.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lm/state.hh b/lm/state.hh index 551510a8e..d8e6c132b 100644 --- a/lm/state.hh +++ b/lm/state.hh @@ -56,14 +56,14 @@ inline uint64_t hash_value(const State &state, uint64_t seed = 0) { struct Left { bool operator==(const Left &other) const { return - (length == other.length) && - pointers[length - 1] == other.pointers[length - 1] && - full == other.full; + length == other.length && + (!length || (pointers[length - 1] == other.pointers[length - 1] && full == other.full)); } int Compare(const Left &other) const { if (length < other.length) return -1; if (length > other.length) return 1; + if (length == 0) return 0; // Must be full. if (pointers[length - 1] > other.pointers[length - 1]) return 1; if (pointers[length - 1] < other.pointers[length - 1]) return -1; return (int)full - (int)other.full; -- cgit v1.2.3