[sword-devel] Bug in CVS

[Joachim Ansorg]

--------------Boundary-00=_FKOAKEV93IUY5SBR2UK2
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

Thank you Troy. It works now again.
I noticed, that if I compile BibleTime with the "-pedantic" option is rep=
orts=20
two errors.
I fixed the first one but was not able to fix the second one.
It's the function multimapwithdefault::has, which is not accepted by the=20
compiler using -pedantic.

=09bool has(const Key& k, const T &val) const {
=09=09multimap<Key, T, Compare>::const_iterator start =3D lower_bound(k);
=09=09multimap<Key, T, Compare>::const_iterator end =3D upper_bound(k);
=09=09for (; start!=3Dend; start++) {
=09=09=09if (start->second =3D=3D val)
=09=09=09=09return true;
=09=09}
=09=09return false;
=09}

The error message is:

/usr/include/sword/multimapwdef.h: In method `bool=20
multimapwithdefault<Key,T,Compare>::has(const Key &, const T &) const':
/usr/include/sword/multimapwdef.h:21: parse error before `=3D'
/usr/include/sword/multimapwdef.h:22: parse error before `=3D'

IMHO this looks right and I don't know what's wrong with it. Would be coo=
l if=20
it can be fixed before 1.5.3, but it's not important.

I attached the patch fopr the first problem (trvial).

Thanks,
Joachim


> Sorry guys,
> =09This was caused by new functionality I snuck in before 1.5.3 was
> finalized (still not finalized).  It should be fixed now.

--------------Boundary-00=_FKOAKEV93IUY5SBR2UK2
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="swmodule.h-patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="swmodule.h-patch"

LS0tIC93b3JrL2RldmVsL2N2cy9zd29yZC9pbmNsdWRlL3N3bW9kdWxlLmgJV2VkIE1hciAyMCAx
Mjo0MDo1OCAyMDAyCisrKyAvdXNyL2luY2x1ZGUvc3dvcmQvc3dtb2R1bGUuaAlUaHUgTWFyIDIx
IDAwOjA5OjQxIDIwMDIKQEAgLTE0Niw3ICsxNDYsNyBAQAogICAvKioKICAgKiBAcmV0dXJuICBU
cnVlIGlmIHRoaXMgbW9kdWxlIGlzIGVuY29kZWQgaW4gVW5pY29kZSwgb3RoZXJ3aXNlIHJldHVy
biBmYWxzZS4KICAgKi8KLSAgdmlydHVhbCBjb25zdCBib29sIGlzVW5pY29kZSgpIGNvbnN0IHty
ZXR1cm4gKGVuY29kaW5nID09IEVOQ19VVEY4IHx8IGVuY29kaW5nID09IEVOQ19TQ1NVKTt9Cisg
IHZpcnR1YWwgY29uc3QgYm9vbCBpc1VuaWNvZGUoKSBjb25zdCB7cmV0dXJuIChlbmNvZGluZyA9
PSAoY2hhcilFTkNfVVRGOCB8fCBlbmNvZGluZyA9PSAoY2hhcilFTkNfU0NTVSk7fQogCiAgIC8v
IFRoZXNlIG1ldGhvZHMgYXJlIHVzZWZ1bCBmb3IgbW9kdWxlcyB0aGF0IGNvbWUgZnJvbSBhIHN0
YW5kYXJkIFNXT1JEIGluc3RhbGwgKG1vc3QgZG8pLgogICAvLyBTV01nciB3aWxsIGNhbGwgc2V0
Q29uZmlnLiAgVGhlIHVzZXIgbWF5IHVzZSBnZXRDb25maWcgYW5kIGdldENvbmZpZ0VudHJ5IChp
ZiB0aGV5Cg==

--------------Boundary-00=_FKOAKEV93IUY5SBR2UK2--