185c185
< event->clearFlags(Event::Scheduled);
---
> event->flags.clear(Event::Scheduled);
203c203
< assert(!event->getFlags(Event::AutoDelete)); // would be silly
---
> assert(!event->flags.isSet(Event::AutoDelete)); // would be silly
207c207
< event->clearFlags(Event::Squashed);
---
> event->flags.clear(Event::Squashed);
210c210
< if (event->getFlags(Event::AutoDelete) && !event->scheduled())
---
> if (event->flags.isSet(Event::AutoDelete) && !event->scheduled())
221c221,222
< SERIALIZE_ENUM(_flags);
---
> short _flags = flags;
> SERIALIZE_SCALAR(_flags);
236,238c237,239
< UNSERIALIZE_ENUM(_flags);
< bool wasScheduled = (_flags & Scheduled) && !(_flags & Squashed);
< _flags &= ~(Squashed | Scheduled);
---
> short _flags;
> UNSERIALIZE_SCALAR(_flags);
> flags = _flags;
239a241,243
> bool wasScheduled = flags.isSet(Scheduled) && !flags.isSet(Squashed);
> flags.clear(Squashed | Scheduled);
>
257c261
< if (nextInBin->getFlags(Event::AutoSerialize)) {
---
> if (nextInBin->flags.isSet(Event::AutoSerialize)) {
392c396
< cprintf("Flags: %#x\n", _flags);
---
> cprintf("Flags: %#x\n", flags);