Ticket #401: weight-no-copying.patch

include/xapian/weight.h

@@ -71 +71 @@
     /// Don't allow assignment.
     void operator=(const Weight &);
 
+    /// Don't allow copying.
+    Weight(const Weight &);
+
     /// A bitmask of the statistics this weighting scheme needs.
     stat_flags stats_needed;
 
@@ -251 +254 @@
     }
 
   protected:
-    /// Only allow subclasses to copy us.
-    Weight(const Weight &);
-
     /// Default constructor, needed by subclass constructors.
     Weight() : stats_needed() { }
 
@@ -327 +327 @@
 
     Xapian::weight get_sumextra(Xapian::termcount doclen) const;
     Xapian::weight get_maxextra() const;
+
+    operator const Xapian::BoolWeight&() const { return *this; }
 };
 
 /// Xapian::Weight subclass implementing the BM25 probabilistic formula.
@@ -431 +433 @@
 
     Xapian::weight get_sumextra(Xapian::termcount doclen) const;
     Xapian::weight get_maxextra() const;
+
+    operator const Xapian::BM25Weight&() const { return *this; }
 };
 
 /** Xapian::Weight subclass implementing the traditional probabilistic formula.
@@ -491 +495 @@
 
     Xapian::weight get_sumextra(Xapian::termcount doclen) const;
     Xapian::weight get_maxextra() const;
+
+    operator const Xapian::TradWeight&() const { return *this; }
 };
 
 }

tests/api_db.cc

@@ -1898 +1898 @@
 
     Xapian::weight get_sumextra(Xapian::termcount) const { return 0; }
     Xapian::weight get_maxextra() const { return 0; }
+
+    operator const MyWeight&() const { return *this; }
 };
 
 // tests user weighting scheme.