Merge branch 'master' of http://www.hyzgame.com:3000/hyzboy/CMCore
This commit is contained in:
commit
21d282d0ba
@ -4,14 +4,6 @@
|
|||||||
#include<iostream>
|
#include<iostream>
|
||||||
#include<hgl/CodePage.h>
|
#include<hgl/CodePage.h>
|
||||||
|
|
||||||
#if (HGL_COMPILER == HGL_COMPILER_GNU)||(HGL_COMPILER == HGL_COMPILER_LLVM)
|
|
||||||
#define __HGL_FUNC__ __PRETTY_FUNCTION__
|
|
||||||
#elif HGL_COMPILER == HGL_COMPILER_Microsoft
|
|
||||||
#define __HGL_FUNC__ __FUNCSIG__
|
|
||||||
#else
|
|
||||||
#define __HGL_FUNC__ __FUNCTION__
|
|
||||||
#endif//
|
|
||||||
|
|
||||||
namespace hgl
|
namespace hgl
|
||||||
{
|
{
|
||||||
namespace logger
|
namespace logger
|
||||||
|
@ -268,5 +268,13 @@ namespace hgl
|
|||||||
#else
|
#else
|
||||||
#define HGL_INCORRECT_DIRECTORY_SEPARATOR OS_TEXT('\\')
|
#define HGL_INCORRECT_DIRECTORY_SEPARATOR OS_TEXT('\\')
|
||||||
#endif//
|
#endif//
|
||||||
|
|
||||||
|
#if (HGL_COMPILER == HGL_COMPILER_GNU)||(HGL_COMPILER == HGL_COMPILER_LLVM)
|
||||||
|
#define __HGL_FUNC__ __PRETTY_FUNCTION__
|
||||||
|
#elif HGL_COMPILER == HGL_COMPILER_Microsoft
|
||||||
|
#define __HGL_FUNC__ __FUNCSIG__
|
||||||
|
#else
|
||||||
|
#define __HGL_FUNC__ __FUNCTION__
|
||||||
|
#endif//
|
||||||
}//namespace hgl
|
}//namespace hgl
|
||||||
#endif//HGL_PLATFORM_INCLUDE
|
#endif//HGL_PLATFORM_INCLUDE
|
||||||
|
@ -47,4 +47,6 @@ namespace hgl
|
|||||||
|
|
||||||
virtual ~IDObject()=default;
|
virtual ~IDObject()=default;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define HGL_IDOBJECT IDObject<__COUNTER__>
|
||||||
}//namespace hgl
|
}//namespace hgl
|
||||||
|
Loading…
x
Reference in New Issue
Block a user