[sword-devel] Bug in CVS

[Joachim Ansorg]

Thank you Troy, that fixed it.

Joachim


> Thank you Troy. It works now again.
> I noticed, that if I compile BibleTime with the "-pedantic" option is
> reports 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
> compiler using -pedantic.
>
> 	bool has(const Key& k, const T &val) const {
> 		multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
> 		multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
> 		for (; start!=end; start++) {
> 			if (start->second == val)
> 				return true;
> 		}
> 		return false;
> 	}
>
> The error message is:
>
> /usr/include/sword/multimapwdef.h: In method `bool
> multimapwithdefault<Key,T,Compare>::has(const Key &, const T &) const':
> /usr/include/sword/multimapwdef.h:21: parse error before `='
> /usr/include/sword/multimapwdef.h:22: parse error before `='
>
> IMHO this looks right and I don't know what's wrong with it. Would be cool
> if 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,
> > 	This was caused by new functionality I snuck in before 1.5.3 was
> > finalized (still not finalized).  It should be fixed now.