Remove SANITIZE_BASE2

This commit is contained in:
Behdad Esfahbod 2010-05-04 14:42:10 -04:00
parent 73c7dbf7f5
commit fbab9f9bd8
2 changed files with 2 additions and 2 deletions

View File

@ -234,7 +234,6 @@ _hb_sanitize_edit (SANITIZE_ARG_DEF,
#define SANITIZE_THIS3(X,Y,Z) (SANITIZE_THIS (X) && SANITIZE_THIS (Y) && SANITIZE_THIS(Z)) #define SANITIZE_THIS3(X,Y,Z) (SANITIZE_THIS (X) && SANITIZE_THIS (Y) && SANITIZE_THIS(Z))
#define SANITIZE_BASE(X,B) likely ((X).sanitize (SANITIZE_ARG, B)) #define SANITIZE_BASE(X,B) likely ((X).sanitize (SANITIZE_ARG, B))
#define SANITIZE_BASE2(X,Y,B) (SANITIZE_BASE (X,B) && SANITIZE_BASE (Y,B))
#define SANITIZE_SELF() SANITIZE_OBJ (*this) #define SANITIZE_SELF() SANITIZE_OBJ (*this)
#define SANITIZE_OBJ(X) SANITIZE_MEM(&(X), sizeof (X)) #define SANITIZE_OBJ(X) SANITIZE_MEM(&(X), sizeof (X))

View File

@ -779,7 +779,8 @@ struct EntryExitRecord
inline bool sanitize (SANITIZE_ARG_DEF, void *base) { inline bool sanitize (SANITIZE_ARG_DEF, void *base) {
TRACE_SANITIZE (); TRACE_SANITIZE ();
return SANITIZE_BASE2 (entryAnchor, exitAnchor, base); return SANITIZE_BASE (entryAnchor, base)
&& SANITIZE_BASE (exitAnchor, base);
} }
OffsetTo<Anchor> OffsetTo<Anchor>