[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/taglib/taglib
From:       Lukáš Lalinský <lalinsky () gmail ! com>
Date:       2011-01-22 21:07:17
Message-ID: 20110122210717.0885FAC8B9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1216365 by lalinsky:

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

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


 M  +1 -1      ape/apefooter.cpp  
 M  +1 -1      mpc/mpcproperties.cpp  
 M  +1 -1      mpeg/mpegheader.cpp  
 M  +0 -1      wavpack/wavpackproperties.cpp  


--- trunk/kdesupport/taglib/taglib/ape/apefooter.cpp #1216364:1216365
@@ -189,7 +189,7 @@
 
   // 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];
--- trunk/kdesupport/taglib/taglib/mpc/mpcproperties.cpp #1216364:1216365
@@ -113,7 +113,7 @@
   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;
   }
--- trunk/kdesupport/taglib/taglib/mpeg/mpegheader.cpp #1216364:1216365
@@ -168,7 +168,7 @@
     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
 
--- trunk/kdesupport/taglib/taglib/wavpack/wavpackproperties.cpp #1216364:1216365
@@ -29,7 +29,6 @@
 
 #include <tstring.h>
 #include <tdebug.h>
-#include <bitset>
 
 #include "wavpackproperties.h"
 #include "wavpackfile.h"
[prev in list] [next in list] [prev in thread] [next in thread]