Merge core

This commit is contained in:
Jesse Beder
2015-01-24 14:40:55 -06:00
14 changed files with 70 additions and 62 deletions

View File

@@ -16,11 +16,11 @@ class NullEventHandler : public EventHandler {
const std::string&) {}
virtual void OnSequenceStart(const Mark&, const std::string&, anchor_t,
EmitterStyle::value style) {}
EmitterStyle::value /* style */) {}
virtual void OnSequenceEnd() {}
virtual void OnMapStart(const Mark&, const std::string&, anchor_t,
EmitterStyle::value style) {}
EmitterStyle::value /* style */) {}
virtual void OnMapEnd() {}
};