diff options
author | Kenneth Heafield <github@kheafield.com> | 2013-06-24 19:05:47 +0400 |
---|---|---|
committer | Kenneth Heafield <github@kheafield.com> | 2013-06-24 19:05:47 +0400 |
commit | 794867c555e82edf3bd12ffb3faa35fb24d6e0a1 (patch) | |
tree | 8fa6a1051d3f878ff5981a66d2e951148743fded /util/sized_iterator.hh | |
parent | f3cd72537c48ad584ee375195d27871932d3805c (diff) |
KenLM 6b4a1c7940a36026de1d96693ccb6ec0f16de8dc
Diffstat (limited to 'util/sized_iterator.hh')
-rw-r--r-- | util/sized_iterator.hh | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/util/sized_iterator.hh b/util/sized_iterator.hh index eb2016b90..dce8f229a 100644 --- a/util/sized_iterator.hh +++ b/util/sized_iterator.hh @@ -36,6 +36,11 @@ class SizedInnerIterator { void *Data() { return ptr_; } std::size_t EntrySize() const { return size_; } + friend inline void swap(SizedInnerIterator &first, SizedInnerIterator &second) { + std::swap(first.ptr_, second.ptr_); + std::swap(first.size_, second.size_); + } + private: uint8_t *ptr_; std::size_t size_; @@ -63,12 +68,22 @@ class SizedProxy { const void *Data() const { return inner_.Data(); } void *Data() { return inner_.Data(); } - + + /** + // TODO: this (deep) swap was recently added. why? if any std heap sort etc + // algs are using swap, that's going to be worse performance than using + // =. i'm not sure why we *want* a deep swap. if C++11 compilers are + // choosing between move constructor and swap, then we'd better implement a + // (deep) move constructor. it may also be that this is moot since i made + // ProxyIterator a reference and added a shallow ProxyIterator swap? (I + // need Ken or someone competent to judge whether that's correct also. - + // let me know at graehl@gmail.com + */ friend void swap(SizedProxy &first, SizedProxy &second) { std::swap_ranges( - static_cast<char*>(first.inner_.Data()), - static_cast<char*>(first.inner_.Data()) + first.inner_.EntrySize(), - static_cast<char*>(second.inner_.Data())); + static_cast<char*>(first.inner_.Data()), + static_cast<char*>(first.inner_.Data()) + first.inner_.EntrySize(), + static_cast<char*>(second.inner_.Data())); } private: @@ -87,7 +102,7 @@ typedef ProxyIterator<SizedProxy> SizedIterator; inline SizedIterator SizedIt(void *ptr, std::size_t size) { return SizedIterator(SizedProxy(ptr, size)); } -// Useful wrapper for a comparison function i.e. sort. +// Useful wrapper for a comparison function i.e. sort. template <class Delegate, class Proxy = SizedProxy> class SizedCompare : public std::binary_function<const Proxy &, const Proxy &, bool> { public: explicit SizedCompare(const Delegate &delegate = Delegate()) : delegate_(delegate) {} @@ -106,7 +121,7 @@ template <class Delegate, class Proxy = SizedProxy> class SizedCompare : public } const Delegate &GetDelegate() const { return delegate_; } - + private: const Delegate delegate_; }; |