Ticket #385: x64.patch

xapian-core/tests/harness/testutils.cc

@@ -30 +30 @@
 
 using namespace std;
 
-ostream &
-operator<<(ostream &os, const vector<unsigned int> &ints)
+template<class T> ostream &
+operator<<(ostream &os, const vector<T> &ints)
 {
     copy(ints.begin(), ints.end(),
-         ostream_iterator<unsigned int>(os, ", "));
+            ostream_iterator<T>(os, ", "));
     return os;
 }
 

xapian-core/tests/harness/testutils.h

@@ -28 +28 @@
 // ######################################################################
 // Useful display operators
 
+template<class T>
 std::ostream &operator<<(std::ostream &os,
-                         const std::vector<unsigned int> &ints);
+                         const std::vector<T> &ints);
 
 // ######################################################################
 // Useful comparison operators

xapian-core/include/xapian/types.h

@@ -21 +21 @@
 #ifndef XAPIAN_INCLUDED_TYPES_H
 #define XAPIAN_INCLUDED_TYPES_H
 
+#define USE_64BIT_DOCID 1
+#define USE_64BIT_TERMCOUNT 1
+
 namespace Xapian {
 
 /** A count of documents.
@@ -28 +31 @@
  *  This is used to hold values such as the number of documents in a database
  *  and the frequency of a term in the database.
  */
+#ifdef USE_64BIT_DOCID
+typedef unsigned long long doccount;
+#else
 typedef unsigned doccount;
+#endif
 
 /** A signed difference between two counts of documents.
  *
  *  This is used by the Xapian classes which are STL containers of documents
  *  for "difference_type".
  */
-typedef int doccount_diff; /* FIXME: can overflow with more than 2^31 docs. */
+/* FIXME: can overflow. */
+#ifdef USE_64BIT_DOCID
+typedef long long doccount_diff;
+#else
+typedef int doccount_diff;
+#endif
 
 /** A unique identifier for a document.
  *
  *  Docid 0 is invalid, providing an "out of range" value which can be
  *  used to mean "not a valid document".
  */
+#ifdef USE_64BIT_DOCID
+typedef unsigned long long docid;
+#else
 typedef unsigned docid;
+#endif
 
 /** A normalised document length.
  *
@@ -58 +74 @@
  *
  *  This is used to hold values such as the Within Document Frequency (wdf).
  */
+#ifdef USE_64BIT_TERMCOUNT
+typedef unsigned long long termcount;
+#else
 typedef unsigned termcount;
+#endif
 
 /** A signed difference between two counts of terms.
  *
  *  This is used by the Xapian classes which are STL containers of terms
  *  for "difference_type".
  */
-typedef int termcount_diff; /* FIXME: can overflow with more than 2^31 terms. */
+/* FIXME: can overflow. */
+#ifdef USE_64BIT_DOCID
+typedef long long termcount_diff;
+#else
+typedef int termcount_diff;
+#endif
 
 /** A term position within a document or query.
  */