[sword-svn] r2189 - trunk/src/mgr

[scribe at www.crosswire.org]

Author: scribe
Date: 2008-07-23 08:16:14 -0700 (Wed, 23 Jul 2008)
New Revision: 2189

Modified:
   trunk/src/mgr/versemgr.cpp
Log:
Patched from dtrotzjr to fix a bugs and compile errors on evc


Modified: trunk/src/mgr/versemgr.cpp
===================================================================
--- trunk/src/mgr/versemgr.cpp	2008-07-22 15:08:04 UTC (rev 2188)
+++ trunk/src/mgr/versemgr.cpp	2008-07-23 15:16:14 UTC (rev 2189)
@@ -79,7 +79,10 @@
 };
 
 struct BookOffsetLess {
+	bool operator() (const VerseMgr::Book &o1, const VerseMgr::Book &o2) const { return o1.p->offsetPrecomputed[0] < o2.p->offsetPrecomputed[0]; }
+	bool operator() (const long &o1, const VerseMgr::Book &o2) const { return o1 < o2.p->offsetPrecomputed[0]; }
 	bool operator() (const VerseMgr::Book &o1, const long &o2) const { return o1.p->offsetPrecomputed[0] < o2; }
+	bool operator() (const long &o1, const long &o2) const { return o1 < o2; }
 };
 
 void VerseMgr::Book::init() {
@@ -103,7 +106,7 @@
 	ntStartOffset = other.ntStartOffset;
 }
 
-VerseMgr::System::System &VerseMgr::System::operator =(const System &other) {
+VerseMgr::System &VerseMgr::System::operator =(const System &other) {
 	name = other.name;
 	BMAX[0] = other.BMAX[0];
 	BMAX[1] = other.BMAX[1];
@@ -181,7 +184,7 @@
 	(*p) = *(other.p);
 }
 
-VerseMgr::Book::Book& VerseMgr::Book::operator =(const Book &other) {
+VerseMgr::Book& VerseMgr::Book::operator =(const Book &other) {
 	longName = other.longName;
 	osisName = other.osisName;
 	prefAbbrev = other.prefAbbrev;