Fix compilation on MSVC 2010 with the C++0x version of std::bitset

Hopefuly it doesn't break anything on older compilers...

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1216365 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/taglib/ape/apefooter.cpp b/taglib/ape/apefooter.cpp
index 8d778d911ecec522e36447f74c485d349b9cd32b..3cae0b2f4b2264148613b4604ae04f8a184d9526 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(data.mid(20, 4).toUInt(false));
+  std::bitset<32> flags(static_cast<unsigned long 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 9024f5bde46dcd86b07def7a5079b63eee3200c0..8ac81b6eaf95badc595d97f69cf21b6462b570f3 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 = d->data.mid(8, 4).toUInt(false);
+    std::bitset<32> flags(static_cast<unsigned long 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 aafdd18fb7af4ab4d097225ba357e6bde9cb09bf..bdc155540373713a45e8bde9810ab9480740d17e 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(data.toUInt());
+  std::bitset<32> flags(static_cast<unsigned long long>(data.toUInt()));
 
   // Check for the second byte's part of the MPEG synch
 

diff --git a/taglib/wavpack/wavpackproperties.cpp b/taglib/wavpack/wavpackproperties.cpp
index 0f65aedb948a5046a483f98db653ae376d6d0df6..52552a0d064337a256538e7640a8afa620dfa671 100644 (file)
--- a/taglib/wavpack/wavpackproperties.cpp
+++ b/taglib/wavpack/wavpackproperties.cpp
@@ -29,7 +29,6 @@
 
 #include <tstring.h>
 #include <tdebug.h>
-#include <bitset>
 
 #include "wavpackproperties.h"
 #include "wavpackfile.h"