提交 ff92de76 编写于 作者: B Behdad Esfahbod

Remove HB_DISALLOW_COPY_AND_ASSIGN

llvm-gcc-4.2 bot had this problem:
hb-private.hh:812: error: initializer specified for non-virtual method 'void hb_vector_t<Type, StaticSize>::operator=(const hb_vector_t<Type, StaticSize>&) [with Type = hb_user_data_array_t::hb_user_data_item_t, unsigned int StaticSize = 1u]'

Removing the delete didn't work with a constructor. So, remove constructor.
Just disallow assignment.  Still better than nothing.
上级 a2444346
...@@ -251,7 +251,7 @@ struct hb_map_t ...@@ -251,7 +251,7 @@ struct hb_map_t
} }
private: private:
HB_DISALLOW_COPY_AND_ASSIGN (hb_map_t); HB_DISALLOW_ASSIGN (hb_map_t);
}; };
......
...@@ -99,7 +99,7 @@ struct hb_ot_shape_planner_t ...@@ -99,7 +99,7 @@ struct hb_ot_shape_planner_t
} }
private: private:
HB_DISALLOW_COPY_AND_ASSIGN (hb_ot_shape_planner_t); HB_DISALLOW_ASSIGN (hb_ot_shape_planner_t);
}; };
......
...@@ -537,11 +537,7 @@ _hb_ceil_to_4 (unsigned int v) ...@@ -537,11 +537,7 @@ _hb_ceil_to_4 (unsigned int v)
*/ */
#define HB_DISALLOW_ASSIGN(TypeName) \ #define HB_DISALLOW_ASSIGN(TypeName) \
void operator=(const TypeName&) = delete void operator=(const TypeName&)
#define HB_DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&) = delete; \
void operator=(const TypeName&) = delete
/* /*
* Static pools * Static pools
......
...@@ -677,7 +677,7 @@ struct hb_set_t ...@@ -677,7 +677,7 @@ struct hb_set_t
inline hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; } inline hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; }
private: private:
HB_DISALLOW_COPY_AND_ASSIGN (hb_set_t); HB_DISALLOW_ASSIGN (hb_set_t);
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册