hyzboy/CMCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved macros to TypeFunc.h from Macro.h

Browse Source
This commit is contained in:
hyzboy 2022-03-31 18:12:12 +08:00
parent d0e099ca0f
commit a14f4c13b4
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/hgl/Macro.h
View File

@ -116,11 +116,5 @@ namespace hgl
else \
return(false); \
}
template<typename EC> 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

8
inc/hgl/TypeFunc.h
View File

@ -15,9 +15,7 @@ namespace hgl
template<typename T>
inline bool RangeCheck(const T &value)
{
if(value<T::BEGIN_RANGE)return(false);
if(value>T::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