Remove more useless inline specifiers.

They are no longer needed since the unnamed namespaces have solved the ODR violation.
This commit is contained in:
Tsuda Kageyu
2016-02-17 22:06:36 +09:00
parent 552185a8b8
commit dadfe79799
4 changed files with 15 additions and 15 deletions

View File

@ -37,7 +37,7 @@ namespace TagLib
namespace
{
inline unsigned short readWORD(File *file, bool *ok = 0)
unsigned short readWORD(File *file, bool *ok = 0)
{
const ByteVector v = file->readBlock(2);
if(v.size() != 2) {
@ -48,7 +48,7 @@ namespace TagLib
return v.toUShort(false);
}
inline unsigned int readDWORD(File *file, bool *ok = 0)
unsigned int readDWORD(File *file, bool *ok = 0)
{
const ByteVector v = file->readBlock(4);
if(v.size() != 4) {
@ -59,7 +59,7 @@ namespace TagLib
return v.toUInt(false);
}
inline long long readQWORD(File *file, bool *ok = 0)
long long readQWORD(File *file, bool *ok = 0)
{
const ByteVector v = file->readBlock(8);
if(v.size() != 8) {
@ -70,7 +70,7 @@ namespace TagLib
return v.toLongLong(false);
}
inline String readString(File *file, int length)
String readString(File *file, int length)
{
ByteVector data = file->readBlock(length);
unsigned int size = data.size();
@ -86,7 +86,7 @@ namespace TagLib
return String(data, String::UTF16LE);
}
inline ByteVector renderString(const String &str, bool includeLength = false)
ByteVector renderString(const String &str, bool includeLength = false)
{
ByteVector data = str.data(String::UTF16LE) + ByteVector::fromShort(0, false);
if(includeLength) {