diff options
author | Haru <haru@dotalux.com> | 2013-12-14 15:14:23 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2013-12-17 01:02:33 +0100 |
commit | a23d072a66d2569ba13921522be3c82ae9aad576 (patch) | |
tree | 7e71523316ba55f2b08477331ecab561e53700d0 /src/common/cbasetypes.h | |
parent | 853c5a3141d1f431af95aed55d991334a2b995f6 (diff) | |
download | hercules-a23d072a66d2569ba13921522be3c82ae9aad576.tar.gz hercules-a23d072a66d2569ba13921522be3c82ae9aad576.tar.bz2 hercules-a23d072a66d2569ba13921522be3c82ae9aad576.tar.xz hercules-a23d072a66d2569ba13921522be3c82ae9aad576.zip |
Added support for non-aborting assertions
- Added Assert_ret, Assert_retv, Assert_retb, Assert_retr, working
similarly to the corresponding nullpo_ functions.
- Moved Assert-related macros to nullpo.h, since they share some
functions.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/common/cbasetypes.h')
-rw-r--r-- | src/common/cbasetypes.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index 6de2ace01..d00f49864 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -353,23 +353,6 @@ typedef char bool; #endif ////////////////////////////////////////////////////////////////////////// -// Assert - -#if ! defined(Assert) -#if defined(RELEASE) -#define Assert(EX) -#else -// extern "C" { -#include <assert.h> -// } -#if !defined(DEFCPP) && defined(WIN32) && !defined(MINGW) -#include <crtdbg.h> -#endif -#define Assert(EX) assert(EX) -#endif -#endif /* ! defined(Assert) */ - -////////////////////////////////////////////////////////////////////////// // Has to be unsigned to avoid problems in some systems // Problems arise when these functions expect an argument in the range [0,256[ and are fed a signed char. #include <ctype.h> @@ -405,7 +388,7 @@ typedef char bool; ////////////////////////////////////////////////////////////////////////// -// Use the preprocessor to 'stringify' stuff (concert to a string). +// Use the preprocessor to 'stringify' stuff (convert to a string). // example: // #define TESTE blabla // QUOTE(TESTE) -> "TESTE" |