mirror of
https://github.com/zeux/pugixml.git
synced 2024-12-27 13:33:17 +08:00
Fixed zero as nullptr constant in macro.
Removed white space that was changed.
This commit is contained in:
parent
b138778fd9
commit
08b966e24f
@ -22,7 +22,6 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
|
|
||||||
#ifdef PUGIXML_WCHAR_MODE
|
#ifdef PUGIXML_WCHAR_MODE
|
||||||
# include <wchar.h>
|
# include <wchar.h>
|
||||||
#endif
|
#endif
|
||||||
@ -2626,7 +2625,7 @@ PUGI_IMPL_NS_BEGIN
|
|||||||
#define PUGI_IMPL_SCANWHILE(X) { while (X) ++s; }
|
#define PUGI_IMPL_SCANWHILE(X) { while (X) ++s; }
|
||||||
#define PUGI_IMPL_SCANWHILE_UNROLL(X) { for (;;) { char_t ss = s[0]; if (PUGI_IMPL_UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
|
#define PUGI_IMPL_SCANWHILE_UNROLL(X) { for (;;) { char_t ss = s[0]; if (PUGI_IMPL_UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
|
||||||
#define PUGI_IMPL_ENDSEG() { ch = *s; *s = 0; ++s; }
|
#define PUGI_IMPL_ENDSEG() { ch = *s; *s = 0; ++s; }
|
||||||
#define PUGI_IMPL_THROW_ERROR(err, m) return error_offset = m, error_status = err, static_cast<char_t*>(0)
|
#define PUGI_IMPL_THROW_ERROR(err, m) return error_offset = m, error_status = err, static_cast<char_t*>(PUGIXML_NULL)
|
||||||
#define PUGI_IMPL_CHECK_ERROR(err, m) { if (*s == 0) PUGI_IMPL_THROW_ERROR(err, m); }
|
#define PUGI_IMPL_CHECK_ERROR(err, m) { if (*s == 0) PUGI_IMPL_THROW_ERROR(err, m); }
|
||||||
|
|
||||||
PUGI_IMPL_FN char_t* strconv_comment(char_t* s, char_t endch)
|
PUGI_IMPL_FN char_t* strconv_comment(char_t* s, char_t endch)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user