This commit is contained in:
Behdad Esfahbod 2010-04-20 23:50:45 -04:00
parent a87072db5d
commit 00e23fcc6f
2 changed files with 7 additions and 7 deletions

View File

@ -347,7 +347,7 @@ struct Sanitizer
{ \
inline NAME& set (TYPE i) { (TYPE&) v = BIG_ENDIAN (i); return *this; } \
inline operator TYPE(void) const { return BIG_ENDIAN ((TYPE&) v); } \
inline bool operator== (const NAME &o) const { return (TYPE&) v == (TYPE&) o.v; } \
inline bool operator == (const NAME &o) const { return (TYPE&) v == (TYPE&) o.v; } \
inline bool sanitize (SANITIZE_ARG_DEF) { \
TRACE_SANITIZE (); \
return SANITIZE_SELF (); \
@ -362,7 +362,7 @@ struct Sanitizer
static inline unsigned int get_size () { return BYTES; } \
inline NAME& set (TYPE i) { BIG_ENDIAN##_put_unaligned(v, i); return *this; } \
inline operator TYPE(void) const { return BIG_ENDIAN##_get_unaligned (v); } \
inline bool operator== (const NAME &o) const { return BIG_ENDIAN##_cmp_unaligned (v, o.v); } \
inline bool operator == (const NAME &o) const { return BIG_ENDIAN##_cmp_unaligned (v, o.v); } \
inline bool sanitize (SANITIZE_ARG_DEF) { \
TRACE_SANITIZE (); \
return SANITIZE_SELF (); \
@ -387,7 +387,7 @@ struct Tag : ULONG
inline Tag (const Tag &o) { *(ULONG*)this = (ULONG&) o; }
inline Tag (uint32_t i) { (*(ULONG*)this).set (i); }
inline Tag (const char *c) { *(ULONG*)this = *(ULONG*)c; }
inline bool operator== (const char *c) const { return *(ULONG*)this == *(ULONG*)c; }
inline bool operator == (const char *c) const { return *(ULONG*)this == *(ULONG*)c; }
/* What the char* converters return is NOT nul-terminated. Print using "%.4s" */
inline operator const char* (void) const { return CONST_CHARP(this); }
inline operator char* (void) { return CHARP(this); }
@ -460,7 +460,7 @@ ASSERT_SIZE (FixedVersion, 4);
template <typename OffsetType, typename Type>
struct GenericOffsetTo : OffsetType
{
inline const Type& operator() (const void *base) const
inline const Type& operator () (const void *base) const
{
unsigned int offset = *this;
if (HB_UNLIKELY (!offset)) return Null(Type);

View File

@ -415,7 +415,7 @@ ASSERT_SIZE (CoverageFormat2, 4);
struct Coverage
{
inline unsigned int operator() (hb_codepoint_t glyph_id) const { return get_coverage (glyph_id); }
inline unsigned int operator () (hb_codepoint_t glyph_id) const { return get_coverage (glyph_id); }
inline unsigned int get_coverage (hb_codepoint_t glyph_id) const
{
@ -533,7 +533,7 @@ ASSERT_SIZE (ClassDefFormat2, 4);
struct ClassDef
{
inline hb_ot_layout_class_t operator() (hb_codepoint_t glyph_id) const { return get_class (glyph_id); }
inline hb_ot_layout_class_t operator () (hb_codepoint_t glyph_id) const { return get_class (glyph_id); }
inline hb_ot_layout_class_t get_class (hb_codepoint_t glyph_id) const
{
@ -569,7 +569,7 @@ struct ClassDef
struct Device
{
inline int operator() (unsigned int ppem_size) const { return get_delta (ppem_size); }
inline int operator () (unsigned int ppem_size) const { return get_delta (ppem_size); }
inline int get_delta (unsigned int ppem_size) const
{