From 52c649d3866f37decd89bf712d58cc0e22fad097 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 12 Jan 2016 10:42:26 +1300 Subject: [PATCH] Make xapian/iterator.h functions 'inline' --- xapian-core/include/xapian/iterator.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xapian-core/include/xapian/iterator.h b/xapian-core/include/xapian/iterator.h index 48b3bd2b9..8603c8368 100644 --- a/xapian-core/include/xapian/iterator.h +++ b/xapian-core/include/xapian/iterator.h @@ -40,42 +40,42 @@ namespace Xapian { /** @internal Determine if iterator is valid to dereference. */ -bool iterator_valid(const Xapian::ESetIterator & it) { +inline bool iterator_valid(const Xapian::ESetIterator & it) { return it.index != it.eset.size(); } /** @internal Determine if iterator is valid to dereference. */ -bool iterator_valid(const Xapian::MSetIterator & it) { +inline bool iterator_valid(const Xapian::MSetIterator & it) { return it.off_from_end != 0; } /** @internal Rewind iterator. */ -void iterator_rewind(Xapian::ESetIterator & it) { +inline void iterator_rewind(Xapian::ESetIterator & it) { it.index = 0; } /** @internal Rewind iterator. */ -void iterator_rewind(Xapian::MSetIterator & it) { +inline void iterator_rewind(Xapian::MSetIterator & it) { it.off_from_end = it.mset.size(); } /** @internal Determine if iterator is valid to dereference. */ -bool iterator_valid(const Xapian::PositionIterator & it) { +inline bool iterator_valid(const Xapian::PositionIterator & it) { return it.internal != NULL; } /** @internal Determine if iterator is valid to dereference. */ -bool iterator_valid(const Xapian::PostingIterator & it) { +inline bool iterator_valid(const Xapian::PostingIterator & it) { return it.internal != NULL; } /** @internal Determine if iterator is valid to dereference. */ -bool iterator_valid(const Xapian::TermIterator & it) { +inline bool iterator_valid(const Xapian::TermIterator & it) { return it.internal != NULL; } /** @internal Determine if iterator is valid to dereference. */ -bool iterator_valid(const Xapian::ValueIterator & it) { +inline bool iterator_valid(const Xapian::ValueIterator & it) { return it.internal != NULL; } -- 2.11.4.GIT