Ticket #86: matcher-min-weight.2.patch

matcher/multimatch.cc

@@ -67 +67 @@
         Xapian::Enquire::Internal::REL_VAL;
 const Xapian::Enquire::Internal::sort_setting VAL =
         Xapian::Enquire::Internal::VAL;
-#if 0 // VAL_REL isn't currently used which causes a warning with SGI CC.
 const Xapian::Enquire::Internal::sort_setting VAL_REL =
         Xapian::Enquire::Internal::VAL_REL;
-#endif
 
 ////////////////////////////////////
 // Initialisation and cleaning up //
@@ -552 +551 @@
                 pop_heap<vector<Xapian::Internal::MSetItem>::iterator,
                          MSetCmp>(items.begin(), items.end(), mcmp);
                 items.pop_back();
-                if (sort_by == REL || sort_by == REL_VAL) {
+                if (sort_by == VAL || sort_by == VAL_REL) {
                     Xapian::weight tmp = min_item.wt;
                     min_item = items.front();
                     min_item.wt = tmp;