From e8c1a1173062dca6c08cd152e676295c66ba0b6a Mon Sep 17 00:00:00 2001 From: Ryan Lucchese Date: Wed, 1 Jul 2015 15:47:21 -0600 Subject: [PATCH] better const correctness for ByteVector::rbegin() const and ByteVector::rend() const --- taglib/toolkit/tbytevector.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp index 4c17a739..fb561e25 100644 --- a/taglib/toolkit/tbytevector.cpp +++ b/taglib/toolkit/tbytevector.cpp @@ -746,11 +746,8 @@ ByteVector::ReverseIterator ByteVector::rbegin() ByteVector::ConstReverseIterator ByteVector::rbegin() const { -#if defined(__SUNPRO_CC) && (__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 + const std::vector &v = d->data->data; + return v.rbegin() + (v.size() - (d->offset + d->length)); } ByteVector::ReverseIterator ByteVector::rend() @@ -761,11 +758,8 @@ ByteVector::ReverseIterator ByteVector::rend() ByteVector::ConstReverseIterator ByteVector::rend() const { -#if defined(__SUNPRO_CC) && (__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 + const std::vector &v = d->data->data; + return v.rbegin() + (v.size() - d->offset); } bool ByteVector::isNull() const