From: Ryan Lucchese <ryan.lucchese@write-c.com>
Date: Wed, 1 Jul 2015 21:47:21 +0000 (-0600)
Subject: better const correctness for ByteVector::rbegin() const and ByteVector::rend() const
X-Git-Tag: v1.11beta~134^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8c1a1173062dca6c08cd152e676295c66ba0b6a;p=taglib

better const correctness for ByteVector::rbegin() const and ByteVector::rend() const
---

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<const char*>(&*(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<char> &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<const char*>(&*(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<char> &v = d->data->data;
+  return v.rbegin() + (v.size() - d->offset);
 }
 
 bool ByteVector::isNull() const