From dadfe7979953dda7ae04ca1c3638495943dedf6d Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Wed, 17 Feb 2016 22:06:36 +0900
Subject: [PATCH] Remove more useless inline specifiers.
They are no longer needed since the unnamed namespaces have solved the ODR violation.
---
taglib/asf/asfutils.h | 10 +++++-----
taglib/mpeg/mpegutils.h | 4 ++--
taglib/riff/riffutils.h | 2 +-
taglib/toolkit/tutils.h | 14 +++++++-------
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/taglib/asf/asfutils.h b/taglib/asf/asfutils.h
index a8ecd70d..4bca5fa6 100644
--- a/taglib/asf/asfutils.h
+++ b/taglib/asf/asfutils.h
@@ -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) {
diff --git a/taglib/mpeg/mpegutils.h b/taglib/mpeg/mpegutils.h
index e35f752f..cc484f25 100644
--- a/taglib/mpeg/mpegutils.h
+++ b/taglib/mpeg/mpegutils.h
@@ -42,12 +42,12 @@ namespace TagLib
* first byte is easy to check for, however checking to see if the second byte
* starts with \e 111 is a bit more tricky, hence these functions.
*/
- inline bool firstSyncByte(unsigned char byte)
+ bool firstSyncByte(unsigned char byte)
{
return (byte == 0xFF);
}
- inline bool secondSynchByte(unsigned char byte)
+ bool secondSynchByte(unsigned char byte)
{
// 0xFF is possible in theory, but it's very unlikely be a header.
diff --git a/taglib/riff/riffutils.h b/taglib/riff/riffutils.h
index ecb985a4..4078385b 100644
--- a/taglib/riff/riffutils.h
+++ b/taglib/riff/riffutils.h
@@ -37,7 +37,7 @@ namespace TagLib
namespace
{
- inline bool isValidChunkName(const ByteVector &name)
+ bool isValidChunkName(const ByteVector &name)
{
if(name.size() != 4)
return false;
diff --git a/taglib/toolkit/tutils.h b/taglib/toolkit/tutils.h
index e3e4f6c3..0a3e14db 100644
--- a/taglib/toolkit/tutils.h
+++ b/taglib/toolkit/tutils.h
@@ -61,7 +61,7 @@ namespace TagLib
/*!
* Reverses the order of bytes in an 16-bit integer.
*/
- inline unsigned short byteSwap(unsigned short x)
+ unsigned short byteSwap(unsigned short x)
{
#if defined(HAVE_BOOST_BYTESWAP)
@@ -97,7 +97,7 @@ namespace TagLib
/*!
* Reverses the order of bytes in an 32-bit integer.
*/
- inline unsigned int byteSwap(unsigned int x)
+ unsigned int byteSwap(unsigned int x)
{
#if defined(HAVE_BOOST_BYTESWAP)
@@ -136,7 +136,7 @@ namespace TagLib
/*!
* Reverses the order of bytes in an 64-bit integer.
*/
- inline unsigned long long byteSwap(unsigned long long x)
+ unsigned long long byteSwap(unsigned long long x)
{
#if defined(HAVE_BOOST_BYTESWAP)
@@ -180,7 +180,7 @@ namespace TagLib
* Returns a formatted string just like standard sprintf(), but makes use of
* safer functions such as snprintf() if available.
*/
- inline String formatString(const char *format, ...)
+ String formatString(const char *format, ...)
{
// Sufficient buffer size for the current internal uses.
// Consider changing this value when you use this function.
@@ -228,7 +228,7 @@ namespace TagLib
* We took the trouble to define this one here, since there are some
* incompatible variations of case insensitive strcmp().
*/
- inline bool equalsIgnoreCase(const char *s1, const char *s2)
+ bool equalsIgnoreCase(const char *s1, const char *s2)
{
while(*s1 != '\0' && *s2 != '\0' && ::tolower(*s1) == ::tolower(*s2)) {
s1++;
@@ -252,7 +252,7 @@ namespace TagLib
/*!
* Returns the integer byte order of the system.
*/
- inline ByteOrder systemByteOrder()
+ ByteOrder systemByteOrder()
{
union {
int i;
@@ -269,7 +269,7 @@ namespace TagLib
/*!
* Returns the IEEE754 byte order of the system.
*/
- inline ByteOrder floatByteOrder()
+ ByteOrder floatByteOrder()
{
union {
double d;
--
2.40.0