summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/osdcomm.h
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
commitddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch)
treea70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/osd/osdcomm.h
parent333bff8de64dfaeb98134000412796b4fdef970b (diff)
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8 also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/osd/osdcomm.h')
-rw-r--r--src/osd/osdcomm.h58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index 814f77e73cd..8e6ee317400 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -61,20 +61,20 @@
/* 8-bit values */
-using UINT8 = std::uint8_t;
-using INT8 = std::int8_t;
+using std::uint8_t;
+using std::int8_t;
/* 16-bit values */
-using UINT16 = std::uint16_t;
-using INT16 = std::int16_t;
+using std::uint16_t;
+using std::int16_t;
/* 32-bit values */
-using UINT32 = std::uint32_t;
-using INT32 = std::int32_t;
+using std::uint32_t;
+using std::int32_t;
/* 64-bit values */
-using UINT64 = std::uint64_t;
-using INT64 = std::int64_t;
+using std::uint64_t;
+using std::int64_t;
/***************************************************************************
FUNDAMENTAL CONSTANTS
@@ -106,9 +106,9 @@ using INT64 = std::int64_t;
/* Concatenate/extract 32-bit halves of 64-bit values */
-constexpr UINT64 concat_64(UINT32 hi, UINT32 lo) { return (UINT64(hi) << 32) | UINT32(lo); }
-constexpr UINT32 extract_64hi(UINT64 val) { return UINT32(val >> 32); }
-constexpr UINT32 extract_64lo(UINT64 val) { return UINT32(val); }
+constexpr uint64_t concat_64(uint32_t hi, uint32_t lo) { return (uint64_t(hi) << 32) | uint32_t(lo); }
+constexpr uint32_t extract_64hi(uint64_t val) { return uint32_t(val >> 32); }
+constexpr uint32_t extract_64lo(uint64_t val) { return uint32_t(val); }
// Highly useful template for compile-time knowledge of an array size
template <typename T, size_t N> constexpr size_t ARRAY_LENGTH(T (&)[N]) { return N;}
@@ -123,29 +123,29 @@ template <typename T, typename U> using equivalent_array_t = typename equivalent
#define EQUIVALENT_ARRAY(a, T) equivalent_array_t<T, std::remove_reference_t<decltype(a)> >
/* Macros for normalizing data into big or little endian formats */
-constexpr UINT16 flipendian_int16(UINT16 val) { return (val << 8) | (val >> 8); }
+constexpr uint16_t flipendian_int16(uint16_t val) { return (val << 8) | (val >> 8); }
-constexpr UINT32 flipendian_int32_partial16(UINT32 val) { return ((val << 8) & 0xFF00FF00U) | ((val >> 8) & 0x00FF00FFU); }
-constexpr UINT32 flipendian_int32(UINT32 val) { return (flipendian_int32_partial16(val) << 16) | (flipendian_int32_partial16(val) >> 16); }
+constexpr uint32_t flipendian_int32_partial16(uint32_t val) { return ((val << 8) & 0xFF00FF00U) | ((val >> 8) & 0x00FF00FFU); }
+constexpr uint32_t flipendian_int32(uint32_t val) { return (flipendian_int32_partial16(val) << 16) | (flipendian_int32_partial16(val) >> 16); }
-constexpr UINT64 flipendian_int64_partial16(UINT64 val) { return ((val << 8) & U64(0xFF00FF00FF00FF00)) | ((val >> 8) & U64(0x00FF00FF00FF00FF)); }
-constexpr UINT64 flipendian_int64_partial32(UINT64 val) { return ((flipendian_int64_partial16(val) << 16) & U64(0xFFFF0000FFFF0000)) | ((flipendian_int64_partial16(val) >> 16) & U64(0x0000FFFF0000FFFF)); }
-constexpr UINT64 flipendian_int64(UINT64 val) { return (flipendian_int64_partial32(val) << 32) | (flipendian_int64_partial32(val) >> 32); }
+constexpr uint64_t flipendian_int64_partial16(uint64_t val) { return ((val << 8) & U64(0xFF00FF00FF00FF00)) | ((val >> 8) & U64(0x00FF00FF00FF00FF)); }
+constexpr uint64_t flipendian_int64_partial32(uint64_t val) { return ((flipendian_int64_partial16(val) << 16) & U64(0xFFFF0000FFFF0000)) | ((flipendian_int64_partial16(val) >> 16) & U64(0x0000FFFF0000FFFF)); }
+constexpr uint64_t flipendian_int64(uint64_t val) { return (flipendian_int64_partial32(val) << 32) | (flipendian_int64_partial32(val) >> 32); }
#ifdef LSB_FIRST
-constexpr UINT16 big_endianize_int16(UINT16 x) { return flipendian_int16(x); }
-constexpr UINT32 big_endianize_int32(UINT32 x) { return flipendian_int32(x); }
-constexpr UINT64 big_endianize_int64(UINT64 x) { return flipendian_int64(x); }
-constexpr UINT16 little_endianize_int16(UINT16 x) { return x; }
-constexpr UINT32 little_endianize_int32(UINT32 x) { return x; }
-constexpr UINT64 little_endianize_int64(UINT64 x) { return x; }
+constexpr uint16_t big_endianize_int16(uint16_t x) { return flipendian_int16(x); }
+constexpr uint32_t big_endianize_int32(uint32_t x) { return flipendian_int32(x); }
+constexpr uint64_t big_endianize_int64(uint64_t x) { return flipendian_int64(x); }
+constexpr uint16_t little_endianize_int16(uint16_t x) { return x; }
+constexpr uint32_t little_endianize_int32(uint32_t x) { return x; }
+constexpr uint64_t little_endianize_int64(uint64_t x) { return x; }
#else
-constexpr UINT16 big_endianize_int16(UINT16 x) { return x; }
-constexpr UINT32 big_endianize_int32(UINT32 x) { return x; }
-constexpr UINT64 big_endianize_int64(UINT64 x) { return x; }
-constexpr UINT16 little_endianize_int16(UINT16 x) { return flipendian_int16(x); }
-constexpr UINT32 little_endianize_int32(UINT32 x) { return flipendian_int32(x); }
-constexpr UINT64 little_endianize_int64(UINT64 x) { return flipendian_int64(x); }
+constexpr uint16_t big_endianize_int16(uint16_t x) { return x; }
+constexpr uint32_t big_endianize_int32(uint32_t x) { return x; }
+constexpr uint64_t big_endianize_int64(uint64_t x) { return x; }
+constexpr uint16_t little_endianize_int16(uint16_t x) { return flipendian_int16(x); }
+constexpr uint32_t little_endianize_int32(uint32_t x) { return flipendian_int32(x); }
+constexpr uint64_t little_endianize_int64(uint64_t x) { return flipendian_int64(x); }
#endif /* LSB_FIRST */
#ifdef _MSC_VER