This should be using operator| not operator||

This is bitwise, not logical.
This commit is contained in:
Scott Wheeler 2016-09-14 19:53:46 +03:00
parent a64772a832
commit 53ac43b5f6

View File

@ -4,7 +4,6 @@
using namespace TagLib;
String TagLib::Version::string()
{
return String::number(TAGLIB_MAJOR_VERSION)
@ -14,12 +13,11 @@ String TagLib::Version::string()
unsigned int TagLib::Version::combined()
{
return (TAGLIB_MAJOR_VERSION << 16)
|| (TAGLIB_MINOR_VERSION << 8)
|| (TAGLIB_PATCH_VERSION << 4);
return (TAGLIB_MAJOR_VERSION << 16) |
(TAGLIB_MINOR_VERSION << 8) |
(TAGLIB_PATCH_VERSION << 4);
}
unsigned int (TagLib::Version::major)()
{
return TAGLIB_MAJOR_VERSION;