diff options
| author | Kenneth Heafield <github@kheafield.com> | 2013-01-05 01:02:47 +0400 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2013-01-05 01:02:47 +0400 |
| commit | f9ee7ae4b3225a132d5abed20e38b0ff2bceb314 (patch) | |
| tree | 7bec71a844c235cf34b18903d6fbd314fe1fb60f /util/joint_sort.hh | |
| parent | 3203f7c92d97181d5f7d293be66873d2865d9209 (diff) | |
KenLM 0e5d259 including read_compressed fix
Diffstat (limited to 'util/joint_sort.hh')
| -rw-r--r-- | util/joint_sort.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/joint_sort.hh b/util/joint_sort.hh index cf3d84321..1b43ddcf4 100644 --- a/util/joint_sort.hh +++ b/util/joint_sort.hh @@ -60,7 +60,7 @@ template <class KeyIter, class ValueIter> class JointProxy { JointProxy(const KeyIter &key_iter, const ValueIter &value_iter) : inner_(key_iter, value_iter) {} JointProxy(const JointProxy<KeyIter, ValueIter> &other) : inner_(other.inner_) {} - operator const value_type() const { + operator value_type() const { value_type ret; ret.key = *inner_.key_; ret.value = *inner_.value_; @@ -121,7 +121,7 @@ template <class Proxy, class Less> class LessWrapper : public std::binary_functi template <class KeyIter, class ValueIter> class PairedIterator : public ProxyIterator<detail::JointProxy<KeyIter, ValueIter> > { public: - PairedIterator(const KeyIter &key, const ValueIter &value) : + PairedIterator(const KeyIter &key, const ValueIter &value) : ProxyIterator<detail::JointProxy<KeyIter, ValueIter> >(detail::JointProxy<KeyIter, ValueIter>(key, value)) {} }; |