From 8a9b8e80595dba0eeb15af074c445b725a685f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Wed, 6 Aug 2014 21:19:12 -0700 Subject: [PATCH] Cleanup. --- include/bx/readerwriter.h | 18 ------------------ include/bx/uint32_t.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/bx/readerwriter.h b/include/bx/readerwriter.h index f181104..6caa236 100644 --- a/include/bx/readerwriter.h +++ b/include/bx/readerwriter.h @@ -212,24 +212,6 @@ namespace bx uint32_t m_size; }; - inline int64_t int64_min(int64_t _a, int64_t _b) - { - return _a < _b ? _a : _b; - } - - inline int64_t int64_max(int64_t _a, int64_t _b) - { - return _a > _b ? _a : _b; - } - - inline int64_t int64_clamp(int64_t _a, int64_t _min, int64_t _max) - { - const int64_t min = int64_min(_a, _max); - const int64_t result = int64_max(_min, min); - - return result; - } - class SizerWriter : public WriterSeekerI { public: diff --git a/include/bx/uint32_t.h b/include/bx/uint32_t.h index 7bacfc5..6fb0292 100644 --- a/include/bx/uint32_t.h +++ b/include/bx/uint32_t.h @@ -595,6 +595,24 @@ namespace bx return _a < _b ? _b : _a; } + inline int64_t int64_min(int64_t _a, int64_t _b) + { + return _a < _b ? _a : _b; + } + + inline int64_t int64_max(int64_t _a, int64_t _b) + { + return _a > _b ? _a : _b; + } + + inline int64_t int64_clamp(int64_t _a, int64_t _min, int64_t _max) + { + const int64_t min = int64_min(_a, _max); + const int64_t result = int64_max(_min, min); + + return result; + } + inline uint64_t uint64_cntlz_ref(uint64_t _val) { return _val & UINT64_C(0xffffffff00000000)