diff options
author | Max Kellermann <max@musicpd.org> | 2019-03-08 10:23:14 +0100 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2020-07-01 17:50:34 +0200 |
commit | 472881cb954b9817679b2801e5b013f0bf3351eb (patch) | |
tree | 6ac7460d5beec1a31ea261384bb724f4582043b0 /src | |
parent | c4efc37ad88d8ee99195544f2dfb9954090df181 (diff) |
util/ByteOrder: remove redundant `inline` keywords from `constexpr` functions
Diffstat (limited to 'src')
-rw-r--r-- | src/util/ByteOrder.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/util/ByteOrder.hxx b/src/util/ByteOrder.hxx index edeeb31c3..719d3a083 100644 --- a/src/util/ByteOrder.hxx +++ b/src/util/ByteOrder.hxx @@ -73,39 +73,39 @@ # endif #endif -static inline constexpr bool +constexpr bool IsLittleEndian() { return IS_LITTLE_ENDIAN; } -static inline constexpr bool +constexpr bool IsBigEndian() { return IS_BIG_ENDIAN; } -static inline constexpr uint16_t +constexpr uint16_t GenericByteSwap16(uint16_t value) { return (value >> 8) | (value << 8); } -static inline constexpr uint32_t +constexpr uint32_t GenericByteSwap32(uint32_t value) { return (value >> 24) | ((value >> 8) & 0x0000ff00) | ((value << 8) & 0x00ff0000) | (value << 24); } -static inline constexpr uint64_t +constexpr uint64_t GenericByteSwap64(uint64_t value) { return uint64_t(GenericByteSwap32(uint32_t(value >> 32))) | (uint64_t(GenericByteSwap32(value)) << 32); } -static inline constexpr uint16_t +constexpr uint16_t ByteSwap16(uint16_t value) { #if CLANG_OR_GCC_VERSION(4,8) @@ -115,7 +115,7 @@ ByteSwap16(uint16_t value) #endif } -static inline constexpr uint32_t +constexpr uint32_t ByteSwap32(uint32_t value) { #if CLANG_OR_GCC_VERSION(4,3) @@ -125,7 +125,7 @@ ByteSwap32(uint32_t value) #endif } -static inline constexpr uint64_t +constexpr uint64_t ByteSwap64(uint64_t value) { #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 */ -static inline constexpr uint16_t +constexpr uint16_t FromBE16(uint16_t 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 */ -static inline constexpr uint32_t +constexpr uint32_t FromBE32(uint32_t 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 */ -static inline constexpr uint64_t +constexpr uint64_t FromBE64(uint64_t 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 */ -static inline constexpr uint16_t +constexpr uint16_t FromLE16(uint16_t 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 */ -static inline constexpr uint32_t +constexpr uint32_t FromLE32(uint32_t 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 */ -static inline constexpr uint64_t +constexpr uint64_t FromLE64(uint64_t 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 */ -static inline constexpr uint16_t +constexpr uint16_t ToBE16(uint16_t 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 */ -static inline constexpr uint32_t +constexpr uint32_t ToBE32(uint32_t 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 */ -static inline constexpr uint64_t +constexpr uint64_t ToBE64(uint64_t 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 */ -static inline constexpr uint16_t +constexpr uint16_t ToLE16(uint16_t 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 */ -static inline constexpr uint32_t +constexpr uint32_t ToLE32(uint32_t 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 */ -static inline constexpr uint64_t +constexpr uint64_t ToLE64(uint64_t value) { return IsLittleEndian() ? value : ByteSwap64(value); |