zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

compat.h: Factor some repeated conditional_t statements into a new take_sign_t

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7559 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-04-10 01:00:50 +00:00 committed by Christoph Oelckers
parent 0d277a6210
commit 0c7a7e1bd6
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/build/include/compat.h
View file

@ -748,6 +748,11 @@ template <typename T>
using make_unsigned_t = typename std::make_unsigned<T>::type; using make_unsigned_t = typename std::make_unsigned<T>::type;
# endif # endif
# ifdef HAVE_CXX11_HEADERS
template <typename type, typename other_type_with_sign>
using take_sign_t = conditional_t< is_signed<other_type_with_sign>::value, make_signed_t<type>, make_unsigned_t<type> >;
# endif
template <size_t size> template <size_t size>
struct integers_of_size { }; struct integers_of_size { };
template <> template <>
@ -955,35 +960,35 @@ static FORCE_INLINE CONSTEXPR uint64_t B_SWAP64_impl(uint64_t value)
/* The purpose of B_PASS* as functions, as opposed to macros, is to prevent them from being used as lvalues. */ /* The purpose of B_PASS* as functions, as opposed to macros, is to prevent them from being used as lvalues. */
#if CXXSTD >= 2011 #if CXXSTD >= 2011
template <typename T> template <typename T>
static FORCE_INLINE CONSTEXPR conditional_t<is_signed<T>::value, int16_t, uint16_t> B_SWAP16(T x) static FORCE_INLINE CONSTEXPR take_sign_t<int16_t, T> B_SWAP16(T x)
{ {
return static_cast< conditional_t<is_signed<T>::value, int16_t, uint16_t> >(B_SWAP16_impl(static_cast<uint16_t>(x))); return static_cast< take_sign_t<int16_t, T> >(B_SWAP16_impl(static_cast<uint16_t>(x)));
} }
template <typename T> template <typename T>
static FORCE_INLINE CONSTEXPR conditional_t<is_signed<T>::value, int32_t, uint32_t> B_SWAP32(T x) static FORCE_INLINE CONSTEXPR take_sign_t<int32_t, T> B_SWAP32(T x)
{ {
return static_cast< conditional_t<is_signed<T>::value, int32_t, uint32_t> >(B_SWAP32_impl(static_cast<uint32_t>(x))); return static_cast< take_sign_t<int32_t, T> >(B_SWAP32_impl(static_cast<uint32_t>(x)));
} }
template <typename T> template <typename T>
static FORCE_INLINE CONSTEXPR conditional_t<is_signed<T>::value, int64_t, uint64_t> B_SWAP64(T x) static FORCE_INLINE CONSTEXPR take_sign_t<int64_t, T> B_SWAP64(T x)
{ {
return static_cast< conditional_t<is_signed<T>::value, int64_t, uint64_t> >(B_SWAP64_impl(static_cast<uint64_t>(x))); return static_cast< take_sign_t<int64_t, T> >(B_SWAP64_impl(static_cast<uint64_t>(x)));
} }
template <typename T> template <typename T>
static FORCE_INLINE CONSTEXPR conditional_t<is_signed<T>::value, int16_t, uint16_t> B_PASS16(T x) static FORCE_INLINE CONSTEXPR take_sign_t<int16_t, T> B_PASS16(T x)
{ {
return static_cast< conditional_t<is_signed<T>::value, int16_t, uint16_t> >(x); return static_cast< take_sign_t<int16_t, T> >(x);
} }
template <typename T> template <typename T>
static FORCE_INLINE CONSTEXPR conditional_t<is_signed<T>::value, int32_t, uint32_t> B_PASS32(T x) static FORCE_INLINE CONSTEXPR take_sign_t<int32_t, T> B_PASS32(T x)
{ {
return static_cast< conditional_t<is_signed<T>::value, int32_t, uint32_t> >(x); return static_cast< take_sign_t<int32_t, T> >(x);
} }
template <typename T> template <typename T>
static FORCE_INLINE CONSTEXPR conditional_t<is_signed<T>::value, int64_t, uint64_t> B_PASS64(T x) static FORCE_INLINE CONSTEXPR take_sign_t<int64_t, T> B_PASS64(T x)
{ {
return static_cast< conditional_t<is_signed<T>::value, int64_t, uint64_t> >(x); return static_cast< take_sign_t<int64_t, T> >(x);
} }
#else #else
#define B_SWAP16(x) B_SWAP16_impl(x) #define B_SWAP16(x) B_SWAP16_impl(x)