rename enums to avoid conflict on win
This commit is contained in:
parent
555f6f1daa
commit
9c65680b48
@ -271,15 +271,15 @@ struct hb_serialize_context_t
|
|||||||
}
|
}
|
||||||
|
|
||||||
enum base_mode_t {
|
enum base_mode_t {
|
||||||
HEAD, /* Relative to the current object head (default). */
|
Head, /* Relative to the current object head (default). */
|
||||||
TAIL, /* Relative to the current object tail. */
|
Tail, /* Relative to the current object tail. */
|
||||||
ABSOLUTE /* Absolute: from the start of the serialize buffer. */
|
Absolute /* Absolute: from the start of the serialize buffer. */
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void add_link (T &ofs, objidx_t objidx,
|
void add_link (T &ofs, objidx_t objidx,
|
||||||
const void *base = nullptr,
|
const void *base = nullptr,
|
||||||
base_mode_t mode = HEAD)
|
base_mode_t mode = Head)
|
||||||
{
|
{
|
||||||
static_assert (sizeof (T) == 2 || sizeof (T) == 4, "");
|
static_assert (sizeof (T) == 2 || sizeof (T) == 4, "");
|
||||||
|
|
||||||
@ -294,15 +294,15 @@ struct hb_serialize_context_t
|
|||||||
|
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case HEAD:
|
case Head:
|
||||||
dflt_base = current->head;
|
dflt_base = current->head;
|
||||||
link.is_absolute = false;
|
link.is_absolute = false;
|
||||||
break;
|
break;
|
||||||
case TAIL:
|
case Tail:
|
||||||
dflt_base = current->tail;
|
dflt_base = current->tail;
|
||||||
link.is_absolute = false;
|
link.is_absolute = false;
|
||||||
break;
|
break;
|
||||||
case ABSOLUTE:
|
case Absolute:
|
||||||
dflt_base = start;
|
dflt_base = start;
|
||||||
link.is_absolute = true;
|
link.is_absolute = true;
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user