mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolve some conflicts before merging.

Browse Source
This commit is contained in:
Tsuda Kageyu 2015-11-19 09:27:15 +09:00
parent 10e1fcd686
commit e0f1151c5c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
taglib/toolkit/tbytevector.cpp
View File

@ -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);
}