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

diff --git a/taglib/ape/apefooter.cpp b/taglib/ape/apefooter.cpp
index 3cae0b2f4b2264148613b4604ae04f8a184d9526..6cef213bf3fa6280feaa2e985c1196eb8e5b9824 100644 (file)
--- 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 8ac81b6eaf95badc595d97f69cf21b6462b570f3..b644053b78da5bc5268df8cc1425762b5e0f9095 100644 (file)
--- 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 bdc155540373713a45e8bde9810ab9480740d17e..ecd4fc8463b45ebbc7280cf5671e4df73b2b6e04 100644 (file)
--- 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