From b698c73690b7a858335763bcae0fe3229925e40b Mon Sep 17 00:00:00 2001 From: Ryan Lucchese Date: Tue, 30 Jun 2015 12:18:12 -0600 Subject: [PATCH] return const correct reverse iterator to prevent Solaris compiler from choking on const conversion --- taglib/toolkit/tbytevector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp index 45ad0317..e9175d64 100644 --- a/taglib/toolkit/tbytevector.cpp +++ b/taglib/toolkit/tbytevector.cpp @@ -746,7 +746,7 @@ ByteVector::ReverseIterator ByteVector::rbegin() ByteVector::ConstReverseIterator ByteVector::rbegin() const { - return d->data->data.rbegin() + (d->data->data.size() - (d->offset + d->length)); + return ConstReverseIterator(static_cast(&*(d->data->data.rbegin() + (d->data->data.size() - (d->offset + d->length))))); } ByteVector::ReverseIterator ByteVector::rend() @@ -757,7 +757,7 @@ ByteVector::ReverseIterator ByteVector::rend() ByteVector::ConstReverseIterator ByteVector::rend() const { - return d->data->data.rbegin() + (d->data->data.size() - d->offset); + return ConstReverseIterator(static_cast(&*(d->data->data.rbegin() + (d->data->data.size() - d->offset)))); } bool ByteVector::isNull() const