From a14f4c13b430ae7e9dca12680834a925c747c9f9 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 31 Mar 2022 18:12:12 +0800 Subject: [PATCH] moved macros to TypeFunc.h from Macro.h --- inc/hgl/Macro.h | 6 ------ inc/hgl/TypeFunc.h | 8 +++++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/inc/hgl/Macro.h b/inc/hgl/Macro.h index 372ed82..ce84daa 100644 --- a/inc/hgl/Macro.h +++ b/inc/hgl/Macro.h @@ -116,11 +116,5 @@ namespace hgl else \ return(false); \ } - - template inline bool EnumClassRangeCheck(const EC &value){return(value>=EC::BEGIN_RANGE&&value<=EC::END_RANGE);} - - #define ENUM_CLASS_RANGE_ERROR_RETURN(value,return_value) if(EnumClassRangeCheck(value))return(return_value); - #define ENUM_CLASS_RANGE_ERROR_RETURN_FALSE(value) if(!EnumClassRangeCheck(value))return(false); - #define ENUM_CLASS_RANGE_ERROR_RETURN_NULLPTR(value) if(!EnumClassRangeCheck(value))return(nullptr); }//namespace hgl #endif//HGL_MACRO_INCLUDE diff --git a/inc/hgl/TypeFunc.h b/inc/hgl/TypeFunc.h index f3c05c8..7b542e5 100644 --- a/inc/hgl/TypeFunc.h +++ b/inc/hgl/TypeFunc.h @@ -15,9 +15,7 @@ namespace hgl template inline bool RangeCheck(const T &value) { - if(valueT::END_RANGE)return(false); - return(true); + return (value>=T::BEGIN_RANGE&&value<=T::END_RANGE); } #define ENUM_CLASS_FOR(ECTYPE,ctype,value) \ @@ -25,6 +23,10 @@ namespace hgl value<=(ctype)ECTYPE::END_RANGE; \ value++) + #define ENUM_CLASS_RANGE_ERROR_RETURN(value,return_value) if(EnumClassRangeCheck(value))return(return_value); + #define ENUM_CLASS_RANGE_ERROR_RETURN_FALSE(value) if(!EnumClassRangeCheck(value))return(false); + #define ENUM_CLASS_RANGE_ERROR_RETURN_NULLPTR(value) if(!EnumClassRangeCheck(value))return(nullptr); + #define HGL_CONVER_TO_MEM_ALIGN(x) ((((x)+HGL_MEM_ALIGN-1)/HGL_MEM_ALIGN)*HGL_MEM_ALIGN) //内存对齐转换宏 #ifndef NULL