From aef463010282d2daac4ce4aead1f20a8fa588ae3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 8 May 2016 23:11:59 -0400 Subject: [PATCH] swap: Remove unused methods Also gets rid of pointer data variants as this prevents the use of the regular swapping routines as unary predicates in std lib functions. They also cast to stricter alignment types, which is undefined behavior. --- src/common/swap.h | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/src/common/swap.h b/src/common/swap.h index a7c37bc44f..f51751d29a 100644 --- a/src/common/swap.h +++ b/src/common/swap.h @@ -58,9 +58,6 @@ namespace Common { -inline u8 swap8(u8 _data) {return _data;} -inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) | _data[2];} - #ifdef _MSC_VER inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);} inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);} @@ -115,31 +112,6 @@ inline double swapd(double f) { return dat2.f; } -inline u16 swap16(const u8* _pData) {return swap16(*(const u16*)_pData);} -inline u32 swap32(const u8* _pData) {return swap32(*(const u32*)_pData);} -inline u64 swap64(const u8* _pData) {return swap64(*(const u64*)_pData);} - -template -void swap(u8*); - -template <> -inline void swap<1>(u8* data) { } - -template <> -inline void swap<2>(u8* data) { - *reinterpret_cast(data) = swap16(data); -} - -template <> -inline void swap<4>(u8* data) { - *reinterpret_cast(data) = swap32(data); -} - -template <> -inline void swap<8>(u8* data) { - *reinterpret_cast(data) = swap64(data); -} - } // Namespace Common