oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/ByteOrder: remove redundant inline keywords from constexpr functions

Browse Source
This commit is contained in:
Max Kellermann 2019-03-08 10:23:14 +01:00
parent c176d94598
commit f6c0688684
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/util/ByteOrder.hxx
View File

@ -73,39 +73,39 @@
# endif # endif
#endif #endif
static inline constexpr bool constexpr bool
IsLittleEndian() IsLittleEndian()
{ {
return IS_LITTLE_ENDIAN; return IS_LITTLE_ENDIAN;
} }
static inline constexpr bool constexpr bool
IsBigEndian() IsBigEndian()
{ {
return IS_BIG_ENDIAN; return IS_BIG_ENDIAN;
} }
static inline constexpr uint16_t constexpr uint16_t
GenericByteSwap16(uint16_t value) GenericByteSwap16(uint16_t value)
{ {
return (value >> 8) | (value << 8); return (value >> 8) | (value << 8);
} }
static inline constexpr uint32_t constexpr uint32_t
GenericByteSwap32(uint32_t value) GenericByteSwap32(uint32_t value)
{ {
return (value >> 24) | ((value >> 8) & 0x0000ff00) | return (value >> 24) | ((value >> 8) & 0x0000ff00) |
((value << 8) & 0x00ff0000) | (value << 24); ((value << 8) & 0x00ff0000) | (value << 24);
} }
static inline constexpr uint64_t constexpr uint64_t
GenericByteSwap64(uint64_t value) GenericByteSwap64(uint64_t value)
{ {
return uint64_t(GenericByteSwap32(uint32_t(value >> 32))) return uint64_t(GenericByteSwap32(uint32_t(value >> 32)))
| (uint64_t(GenericByteSwap32(value)) << 32); | (uint64_t(GenericByteSwap32(value)) << 32);
} }
static inline constexpr uint16_t constexpr uint16_t
ByteSwap16(uint16_t value) ByteSwap16(uint16_t value)
{ {
#if CLANG_OR_GCC_VERSION(4,8) #if CLANG_OR_GCC_VERSION(4,8)
@ -115,7 +115,7 @@ ByteSwap16(uint16_t value)
#endif #endif
} }
static inline constexpr uint32_t constexpr uint32_t
ByteSwap32(uint32_t value) ByteSwap32(uint32_t value)
{ {
#if CLANG_OR_GCC_VERSION(4,3) #if CLANG_OR_GCC_VERSION(4,3)
@ -125,7 +125,7 @@ ByteSwap32(uint32_t value)
#endif #endif
} }
static inline constexpr uint64_t constexpr uint64_t
ByteSwap64(uint64_t value) ByteSwap64(uint64_t value)
{ {
#if CLANG_OR_GCC_VERSION(4,3) #if CLANG_OR_GCC_VERSION(4,3)
@ -138,7 +138,7 @@ ByteSwap64(uint64_t value)
/** /**
* Converts a 16bit value from big endian to the system's byte order * Converts a 16bit value from big endian to the system's byte order
*/ */
static inline constexpr uint16_t constexpr uint16_t
FromBE16(uint16_t value) FromBE16(uint16_t value)
{ {
return IsBigEndian() ? value : ByteSwap16(value); return IsBigEndian() ? value : ByteSwap16(value);
@ -147,7 +147,7 @@ FromBE16(uint16_t value)
/** /**
* Converts a 32bit value from big endian to the system's byte order * Converts a 32bit value from big endian to the system's byte order
*/ */
static inline constexpr uint32_t constexpr uint32_t
FromBE32(uint32_t value) FromBE32(uint32_t value)
{ {
return IsBigEndian() ? value : ByteSwap32(value); return IsBigEndian() ? value : ByteSwap32(value);
@ -156,7 +156,7 @@ FromBE32(uint32_t value)
/** /**
* Converts a 64bit value from big endian to the system's byte order * Converts a 64bit value from big endian to the system's byte order
*/ */
static inline constexpr uint64_t constexpr uint64_t
FromBE64(uint64_t value) FromBE64(uint64_t value)
{ {
return IsBigEndian() ? value : ByteSwap64(value); return IsBigEndian() ? value : ByteSwap64(value);
@ -165,7 +165,7 @@ FromBE64(uint64_t value)
/** /**
* Converts a 16bit value from little endian to the system's byte order * Converts a 16bit value from little endian to the system's byte order
*/ */
static inline constexpr uint16_t constexpr uint16_t
FromLE16(uint16_t value) FromLE16(uint16_t value)
{ {
return IsLittleEndian() ? value : ByteSwap16(value); return IsLittleEndian() ? value : ByteSwap16(value);
@ -174,7 +174,7 @@ FromLE16(uint16_t value)
/** /**
* Converts a 32bit value from little endian to the system's byte order * Converts a 32bit value from little endian to the system's byte order
*/ */
static inline constexpr uint32_t constexpr uint32_t
FromLE32(uint32_t value) FromLE32(uint32_t value)
{ {
return IsLittleEndian() ? value : ByteSwap32(value); return IsLittleEndian() ? value : ByteSwap32(value);
@ -183,7 +183,7 @@ FromLE32(uint32_t value)
/** /**
* Converts a 64bit value from little endian to the system's byte order * Converts a 64bit value from little endian to the system's byte order
*/ */
static inline constexpr uint64_t constexpr uint64_t
FromLE64(uint64_t value) FromLE64(uint64_t value)
{ {
return IsLittleEndian() ? value : ByteSwap64(value); return IsLittleEndian() ? value : ByteSwap64(value);
@ -192,7 +192,7 @@ FromLE64(uint64_t value)
/** /**
* Converts a 16bit value from the system's byte order to big endian * Converts a 16bit value from the system's byte order to big endian
*/ */
static inline constexpr uint16_t constexpr uint16_t
ToBE16(uint16_t value) ToBE16(uint16_t value)
{ {
return IsBigEndian() ? value : ByteSwap16(value); return IsBigEndian() ? value : ByteSwap16(value);
@ -201,7 +201,7 @@ ToBE16(uint16_t value)
/** /**
* Converts a 32bit value from the system's byte order to big endian * Converts a 32bit value from the system's byte order to big endian
*/ */
static inline constexpr uint32_t constexpr uint32_t
ToBE32(uint32_t value) ToBE32(uint32_t value)
{ {
return IsBigEndian() ? value : ByteSwap32(value); return IsBigEndian() ? value : ByteSwap32(value);
@ -210,7 +210,7 @@ ToBE32(uint32_t value)
/** /**
* Converts a 64bit value from the system's byte order to big endian * Converts a 64bit value from the system's byte order to big endian
*/ */
static inline constexpr uint64_t constexpr uint64_t
ToBE64(uint64_t value) ToBE64(uint64_t value)
{ {
return IsBigEndian() ? value : ByteSwap64(value); return IsBigEndian() ? value : ByteSwap64(value);
@ -219,7 +219,7 @@ ToBE64(uint64_t value)
/** /**
* Converts a 16bit value from the system's byte order to little endian * Converts a 16bit value from the system's byte order to little endian
*/ */
static inline constexpr uint16_t constexpr uint16_t
ToLE16(uint16_t value) ToLE16(uint16_t value)
{ {
return IsLittleEndian() ? value : ByteSwap16(value); return IsLittleEndian() ? value : ByteSwap16(value);
@ -228,7 +228,7 @@ ToLE16(uint16_t value)
/** /**
* Converts a 32bit value from the system's byte order to little endian * Converts a 32bit value from the system's byte order to little endian
*/ */
static inline constexpr uint32_t constexpr uint32_t
ToLE32(uint32_t value) ToLE32(uint32_t value)
{ {
return IsLittleEndian() ? value : ByteSwap32(value); return IsLittleEndian() ? value : ByteSwap32(value);
@ -237,7 +237,7 @@ ToLE32(uint32_t value)
/** /**
* Converts a 64bit value from the system's byte order to little endian * Converts a 64bit value from the system's byte order to little endian
*/ */
static inline constexpr uint64_t constexpr uint64_t
ToLE64(uint64_t value) ToLE64(uint64_t value)
{ {
return IsLittleEndian() ? value : ByteSwap64(value); return IsLittleEndian() ? value : ByteSwap64(value);