diff options
author | Carl Worth <cworth@cworth.org> | 2009-10-20 22:08:31 -0700 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2009-10-20 22:10:07 -0700 |
commit | f6c7810945f1bc25b15dee72257c3b68bd0e8a40 (patch) | |
tree | 839159fb8cc3b0679f26468f63a50efe0433cb03 /query.cc | |
parent | 466a7bbf620e4bf1b57097a6d3c474159c475b6d (diff) |
Rename our talloc destructor functions to _destructor.
I want to reserve the _destroy names for some public functions
I'm about to add.
Diffstat (limited to 'query.cc')
-rw-r--r-- | query.cc | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -66,8 +66,14 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort) query->sort = sort; } +/* We end up having to call the destructors explicitly because we had + * to use "placement new" in order to initialize C++ objects within a + * block that we allocated with talloc. So C++ is making talloc + * slightly less simple to use, (we wouldn't need + * talloc_set_destructor at all otherwise). + */ static int -_notmuch_results_destroy (notmuch_results_t *results) +_notmuch_results_destructor (notmuch_results_t *results) { results->iterator.~PostingIterator (); results->iterator_end.~PostingIterator (); @@ -94,7 +100,7 @@ notmuch_query_search (notmuch_query_t *query) new (&results->iterator) Xapian::PostingIterator (); new (&results->iterator_end) Xapian::PostingIterator (); - talloc_set_destructor (results, _notmuch_results_destroy); + talloc_set_destructor (results, _notmuch_results_destructor); results->iterator = query->notmuch->xapian_db->postlist_begin (""); results->iterator_end = query->notmuch->xapian_db->postlist_end (""); |