Index: trunk/lttoolbox/lttoolbox/alphabet.cc =================================================================== --- trunk/lttoolbox/lttoolbox/alphabet.cc (revision 72190) +++ trunk/lttoolbox/lttoolbox/alphabet.cc (revision 72193) @@ -198,7 +198,7 @@ spair.clear(); slexicinv = Deserialiser >::deserialise(serialised); for (size_t i = 0; i < slexicinv.size(); i++) { - slexic[slexicinv[i]] = i; + slexic[slexicinv[i]] = -i - 1; } spairinv = Deserialiser > >::deserialise(serialised); for (size_t i = 0; i < slexicinv.size(); i++) { Index: trunk/lttoolbox/lttoolbox/deserialiser.h =================================================================== --- trunk/lttoolbox/lttoolbox/deserialiser.h (revision 72190) +++ trunk/lttoolbox/lttoolbox/deserialiser.h (revision 72193) @@ -157,7 +157,7 @@ } int64_t Deserialiser::deserialise(std::istream &Stream_) { - return int_deserialise(Stream_); + return int_deserialise(Stream_); } uint64_t Deserialiser::deserialise(std::istream &Stream_) { @@ -165,11 +165,11 @@ } int32_t Deserialiser::deserialise(std::istream &Stream_) { - return int_deserialise(Stream_); + return int_deserialise(Stream_); } uint32_t Deserialiser::deserialise(std::istream &Stream_) { - return int_deserialise(Stream_); + return int_deserialise(Stream_); } wchar_t Deserialiser::deserialise(std::istream &Stream_) { Index: trunk/lttoolbox/lttoolbox/serialiser.h =================================================================== --- trunk/lttoolbox/lttoolbox/serialiser.h (revision 72190) +++ trunk/lttoolbox/lttoolbox/serialiser.h (revision 72193) @@ -180,7 +180,7 @@ void Serialiser::serialise(const int64_t &SerialisedType_, std::ostream &Output) { - Serialiser::serialise(SerialisedType_, Output); + int_serialise((uint64_t)SerialisedType_, Output); } void Serialiser::serialise(const uint64_t &SerialisedType_, @@ -190,12 +190,12 @@ void Serialiser::serialise(const int32_t &SerialisedType_, std::ostream &Output) { - Serialiser::serialise(SerialisedType_, Output); + int_serialise((uint64_t)SerialisedType_, Output); } void Serialiser::serialise(const uint32_t &SerialisedType_, std::ostream &Output) { - int_serialise(SerialisedType_, Output); + int_serialise((uint64_t)SerialisedType_, Output); } void Serialiser::serialise(const wchar_t &SerialisedType_,