diff options
| author | Lukáš Lalinský <lalinsky@gmail.com> | 2011-01-24 06:02:15 +0000 |
|---|---|---|
| committer | Lukáš Lalinský <lalinsky@gmail.com> | 2011-01-24 06:02:15 +0000 |
| commit | df86f45dad6f8547142c4d5cee2ff20a8b9b50e1 (patch) | |
| tree | c47dd0bb53ff0c343d9fdcadaf39b4d77226e5d6 | |
| parent | b051df00623ec9fa3be09032652728743f78f098 (diff) | |
Back to unsigned long, it breaks compilation on Solaris
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1216598 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | taglib/ape/apefooter.cpp | 2 | ||||
| -rw-r--r-- | taglib/mpc/mpcproperties.cpp | 2 | ||||
| -rw-r--r-- | taglib/mpeg/mpegheader.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/taglib/ape/apefooter.cpp b/taglib/ape/apefooter.cpp index 3cae0b2f..6cef213b 100644 --- a/taglib/ape/apefooter.cpp +++ b/taglib/ape/apefooter.cpp @@ -189,7 +189,7 @@ void Footer::parse(const ByteVector &data) // Read the flags - std::bitset<32> flags(static_cast<unsigned long long>(data.mid(20, 4).toUInt(false))); + std::bitset<32> flags(static_cast<unsigned long>(data.mid(20, 4).toUInt(false))); d->headerPresent = flags[31]; d->footerPresent = !flags[30]; diff --git a/taglib/mpc/mpcproperties.cpp b/taglib/mpc/mpcproperties.cpp index 8ac81b6e..b644053b 100644 --- a/taglib/mpc/mpcproperties.cpp +++ b/taglib/mpc/mpcproperties.cpp @@ -113,7 +113,7 @@ void MPC::Properties::read() if(d->version >= 7) { frames = d->data.mid(4, 4).toUInt(false); - std::bitset<32> flags(static_cast<unsigned long long>(d->data.mid(8, 4).toUInt(false))); + std::bitset<32> flags(static_cast<unsigned long>(d->data.mid(8, 4).toUInt(false))); d->sampleRate = sftable[flags[17] * 2 + flags[16]]; d->channels = 2; } diff --git a/taglib/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp index bdc15554..ecd4fc84 100644 --- a/taglib/mpeg/mpegheader.cpp +++ b/taglib/mpeg/mpegheader.cpp @@ -168,7 +168,7 @@ void MPEG::Header::parse(const ByteVector &data) return; } - std::bitset<32> flags(static_cast<unsigned long long>(data.toUInt())); + std::bitset<32> flags(static_cast<unsigned long>(data.toUInt())); // Check for the second byte's part of the MPEG synch |