From 78af1ef80f84023b4ff0661c47201850dbd46363 Mon Sep 17 00:00:00 2001 From: Kenneth Heafield Date: Mon, 21 Mar 2011 15:55:14 -0400 Subject: Update error handling and a corner case of trie. --- klm/util/exception.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'klm/util') diff --git a/klm/util/exception.cc b/klm/util/exception.cc index 077405f4..84f9fe7c 100644 --- a/klm/util/exception.cc +++ b/klm/util/exception.cc @@ -9,11 +9,11 @@ Exception::Exception() throw() {} Exception::~Exception() throw() {} Exception::Exception(const Exception &from) : std::exception() { - stream_.str(from.stream_.str()); + stream_ << from.stream_.str(); } Exception &Exception::operator=(const Exception &from) { - stream_.str(from.stream_.str()); + stream_ << from.stream_.str(); return *this; } -- cgit v1.2.3 From 2d0c2c2bf7c35db2e16d16f39cb9749a04bc91df Mon Sep 17 00:00:00 2001 From: Kenneth Heafield Date: Mon, 21 Mar 2011 22:00:29 -0400 Subject: compiler warnings --- klm/util/bit_packing.hh | 7 +++++-- klm/util/have.hh | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'klm/util') diff --git a/klm/util/bit_packing.hh b/klm/util/bit_packing.hh index 70cfc2d2..5c71c792 100644 --- a/klm/util/bit_packing.hh +++ b/klm/util/bit_packing.hh @@ -28,16 +28,19 @@ namespace util { * but it may be called multiple times when that's inconvenient. */ -inline uint8_t BitPackShift(uint8_t bit, uint8_t length) { + // Fun fact: __BYTE_ORDER is wrong on Solaris Sparc, but the version without __ is correct. #if BYTE_ORDER == LITTLE_ENDIAN +inline uint8_t BitPackShift(uint8_t bit, uint8_t /*length*/) { return bit; +} #elif BYTE_ORDER == BIG_ENDIAN +inline uint8_t BitPackShift(uint8_t bit, uint8_t length) { return 64 - length - bit; +} #else #error "Bit packing code isn't written for your byte order." #endif -} /* Pack integers up to 57 bits using their least significant digits. * The length is specified using mask: diff --git a/klm/util/have.hh b/klm/util/have.hh index 7cf62008..f2f0cf90 100644 --- a/klm/util/have.hh +++ b/klm/util/have.hh @@ -2,8 +2,14 @@ #ifndef UTIL_HAVE__ #define UTIL_HAVE__ +#ifndef HAVE_ZLIB #define HAVE_ZLIB +#endif + // #define HAVE_ICU + +#ifndef HAVE_BOOST #define HAVE_BOOST +#endif #endif // UTIL_HAVE__ -- cgit v1.2.3