diff options
author | archshift <admin@archshift.com> | 2015-02-19 07:46:21 +0100 |
---|---|---|
committer | archshift <admin@archshift.com> | 2015-02-20 07:26:25 +0100 |
commit | 4fb75d220aeaa66d3e907cc2311acf6c29433800 (patch) | |
tree | 8fa12b7d7dd3fde83ce126c0ffe3c8011d839f4f /src/common/common_funcs.h | |
parent | Remove duplication of INSERT_PADDING_WORDS between pica.h and gpu.h (diff) | |
download | yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.gz yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.bz2 yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.lz yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.xz yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.zst yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.zip |
Diffstat (limited to 'src/common/common_funcs.h')
-rw-r--r-- | src/common/common_funcs.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index daec8f0ff..bc296ed3e 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -24,11 +24,6 @@ template<> struct CompileTimeAssert<true> {}; #define b32(x) (b16(x) | (b16(x) >>16) ) #define ROUND_UP_POW2(x) (b32(x - 1) + 1) -#define MIN(a, b) ((a)<(b)?(a):(b)) -#define MAX(a, b) ((a)>(b)?(a):(b)) - -#define CLAMP(x, min, max) (((x) > max) ? max : (((x) < min) ? min : (x))) - #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) /// Textually concatenates two tokens. The double-expansion is required by the C preprocessor. @@ -147,15 +142,6 @@ inline u64 _rotr64(u64 x, unsigned int shift){ #define Crash() {DebugBreak();} #endif // _MSC_VER ndef -// Dolphin's min and max functions -#undef min -#undef max - -template<class T> -inline T min(const T& a, const T& b) {return a > b ? b : a;} -template<class T> -inline T max(const T& a, const T& b) {return a > b ? a : b;} - // Generic function to get last error message. // Call directly after the command or use the error num. // This function might change the error code. @@ -232,13 +218,4 @@ inline void swap<8>(u8* data) *reinterpret_cast<u64*>(data) = swap64(data); } -template <typename T> -inline T FromBigEndian(T data) -{ - //static_assert(std::is_arithmetic<T>::value, "function only makes sense with arithmetic types"); - - swap<sizeof(data)>(reinterpret_cast<u8*>(&data)); - return data; -} - } // Namespace Common |