walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[HB] Remove DEFINE_NON_INSTANTIABLE

This commit is contained in:
Behdad Esfahbod 2009-05-08 21:17:56 -04:00
parent 0dff25f036
commit c5419b6cf2
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-ot-layout-gdef-private.h
View File

@ -149,8 +149,6 @@ struct CaretValueFormat3 {
ASSERT_SIZE (CaretValueFormat3, 6); ASSERT_SIZE (CaretValueFormat3, 6);
struct CaretValue { struct CaretValue {
DEFINE_NON_INSTANTIABLE(CaretValue);
/* XXX we need access to a load-contour-point vfunc here */ /* XXX we need access to a load-contour-point vfunc here */
int get_caret_value (int ppem) const { int get_caret_value (int ppem) const {
switch (u.caretValueFormat) { switch (u.caretValueFormat) {

3
src/hb-ot-layout-gsub-private.h
View File

@ -997,7 +997,6 @@ enum {
}; };
struct SubstLookupSubTable { struct SubstLookupSubTable {
DEFINE_NON_INSTANTIABLE(SubstLookupSubTable);
friend struct SubstLookup; friend struct SubstLookup;
@ -1052,8 +1051,6 @@ inline bool ExtensionSubstFormat1::substitute (SUBTABLE_SUBSTITUTE_ARGS_DEF) con
struct SubstLookup : Lookup { struct SubstLookup : Lookup {
DEFINE_NON_INSTANTIABLE(SubstLookup);
inline const SubstLookupSubTable& get_subtable (unsigned int i) const { inline const SubstLookupSubTable& get_subtable (unsigned int i) const {
return *(SubstLookupSubTable*)&(((Lookup *)this)->get_subtable (i)); return *(SubstLookupSubTable*)&(((Lookup *)this)->get_subtable (i));
} }

18
src/hb-ot-layout-open-private.h
View File

@ -184,12 +184,6 @@
* Class features * Class features
*/ */
/* makes class uninstantiable. should be used for union classes that don't
* contain any complete type */
#define DEFINE_NON_INSTANTIABLE(Type) \
protected: inline Type() {} /* cannot be instantiated */ \
public:
// TODO use a global nul-array for most Null's // TODO use a global nul-array for most Null's
/* defines Null##Type as a safe nil instance of Type */ /* defines Null##Type as a safe nil instance of Type */
#define DEFINE_NULL_DATA(Type, size, data) \ #define DEFINE_NULL_DATA(Type, size, data) \
@ -440,7 +434,7 @@ DEFINE_NULL_ASSERT_SIZE (TTCHeader, 12);
*/ */
struct OpenTypeFontFile { struct OpenTypeFontFile {
DEFINE_NON_INSTANTIABLE(OpenTypeFontFile);
static const hb_tag_t TrueTypeTag = HB_TAG ( 0 , 1 , 0 , 0 ); static const hb_tag_t TrueTypeTag = HB_TAG ( 0 , 1 , 0 , 0 );
static const hb_tag_t CFFTag = HB_TAG ('O','T','T','O'); static const hb_tag_t CFFTag = HB_TAG ('O','T','T','O');
static const hb_tag_t TTCTag = HB_TAG ('t','t','c','f'); static const hb_tag_t TTCTag = HB_TAG ('t','t','c','f');
@ -648,8 +642,6 @@ struct LookupFlag : USHORT {
DEFINE_NULL_ASSERT_SIZE (LookupFlag, 2); DEFINE_NULL_ASSERT_SIZE (LookupFlag, 2);
struct LookupSubTable { struct LookupSubTable {
DEFINE_NON_INSTANTIABLE(LookupSubTable);
private: private:
USHORT format; /* Subtable format. Different for GSUB and GPOS */ USHORT format; /* Subtable format. Different for GSUB and GPOS */
}; };
@ -657,8 +649,6 @@ DEFINE_NULL_ASSERT_SIZE (LookupSubTable, 2);
struct Lookup { struct Lookup {
DEFINE_NON_INSTANTIABLE(Lookup);
DEFINE_ARRAY_INTERFACE (LookupSubTable, subtable); /* get_subtable_count(), get_subtable(i) */ DEFINE_ARRAY_INTERFACE (LookupSubTable, subtable); /* get_subtable_count(), get_subtable(i) */
inline bool is_right_to_left (void) const { return lookupFlag & LookupFlag::RightToLeft; } inline bool is_right_to_left (void) const { return lookupFlag & LookupFlag::RightToLeft; }
@ -778,8 +768,6 @@ struct CoverageFormat2 {
ASSERT_SIZE (CoverageFormat2, 4); ASSERT_SIZE (CoverageFormat2, 4);
struct Coverage { struct Coverage {
DEFINE_NON_INSTANTIABLE(Coverage);
unsigned int get_coverage (hb_codepoint_t glyph_id) const { unsigned int get_coverage (hb_codepoint_t glyph_id) const {
switch (u.coverageFormat) { switch (u.coverageFormat) {
case 1: return u.format1.get_coverage(glyph_id); case 1: return u.format1.get_coverage(glyph_id);
@ -869,8 +857,6 @@ struct ClassDefFormat2 {
ASSERT_SIZE (ClassDefFormat2, 4); ASSERT_SIZE (ClassDefFormat2, 4);
struct ClassDef { struct ClassDef {
DEFINE_NON_INSTANTIABLE(ClassDef);
hb_ot_layout_class_t get_class (hb_codepoint_t glyph_id) const { hb_ot_layout_class_t get_class (hb_codepoint_t glyph_id) const {
switch (u.classFormat) { switch (u.classFormat) {
case 1: return u.format1.get_class(glyph_id); case 1: return u.format1.get_class(glyph_id);
@ -893,8 +879,6 @@ DEFINE_NULL (ClassDef, 2);
*/ */
struct Device { struct Device {
DEFINE_NON_INSTANTIABLE(Device);
int get_delta (int ppem_size) const { int get_delta (int ppem_size) const {
if (ppem_size >= startSize && ppem_size <= endSize && if (ppem_size >= startSize && ppem_size <= endSize &&
deltaFormat >= 1 && deltaFormat <= 3) { deltaFormat >= 1 && deltaFormat <= 3) {