From a3dccdc7a3a7c5121adf96aa91d58df58343361e Mon Sep 17 00:00:00 2001 From: Ryan Lucchese Date: Tue, 30 Jun 2015 12:46:25 -0600 Subject: [PATCH] added sun compiler version check before changing constness of ConstReverseIterator in ByteVector --- taglib/toolkit/tbytevector.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp index e9175d64..ac32af71 100644 --- a/taglib/toolkit/tbytevector.cpp +++ b/taglib/toolkit/tbytevector.cpp @@ -746,7 +746,11 @@ ByteVector::ReverseIterator ByteVector::rbegin() ByteVector::ConstReverseIterator ByteVector::rbegin() const { +#if __SUNPRO_CC >= 0x5130 return ConstReverseIterator(static_cast(&*(d->data->data.rbegin() + (d->data->data.size() - (d->offset + d->length))))); +#else + return d->data->data.rbegin() + (d->data->data.size() - (d->offset + d->length)); +#endif } ByteVector::ReverseIterator ByteVector::rend() @@ -757,7 +761,11 @@ ByteVector::ReverseIterator ByteVector::rend() ByteVector::ConstReverseIterator ByteVector::rend() const { +#if __SUNPRO_CC >= 0x5130 return ConstReverseIterator(static_cast(&*(d->data->data.rbegin() + (d->data->data.size() - d->offset)))); +#else + return d->data->data.rbegin() + (d->data->data.size() - d->offset); +#endif } bool ByteVector::isNull() const