From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Thu, 19 Nov 2015 00:27:15 +0000 (+0900)
Subject: Resolve some conflicts before merging.
X-Git-Tag: v1.11beta~131^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0f1151c5cdb4cc7b9125a70b019997b6e089382;p=taglib

Resolve some conflicts before merging.
---

diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index d2464974..c65962da 100644
--- a/taglib/toolkit/tbytevector.cpp
+++ b/taglib/toolkit/tbytevector.cpp
@@ -661,8 +661,9 @@ ByteVector::ReverseIterator ByteVector::rbegin()
 
 ByteVector::ConstReverseIterator ByteVector::rbegin() const
 {
-  // we need a const reference to the data vector so we can ensure the const version of rbegin() is called
-  const std::vector<char> &v = d->data->data;
+  // Workaround for the Solaris Studio 12.4 compiler.
+  // We need a const reference to the data vector so we can ensure the const version of rbegin() is called.
+  const std::vector<char> &v = *d->data;
   return v.rbegin() + (v.size() - (d->offset + d->length));
 }
 
@@ -674,8 +675,9 @@ ByteVector::ReverseIterator ByteVector::rend()
 
 ByteVector::ConstReverseIterator ByteVector::rend() const
 {
-  // we need a const reference to the data vector so we can ensure the const version of rbegin() is called
-  const std::vector<char> &v = d->data->data;
+  // Workaround for the Solaris Studio 12.4 compiler.
+  // We need a const reference to the data vector so we can ensure the const version of rbegin() is called.
+  const std::vector<char> &v = *d->data;
   return v.rbegin() + (v.size() - d->offset);
 }