diff options
Diffstat (limited to 'mwe/events/include/eventManager.h')
| -rw-r--r-- | mwe/events/include/eventManager.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mwe/events/include/eventManager.h b/mwe/events/include/eventManager.h index af41b82..91bac8c 100644 --- a/mwe/events/include/eventManager.h +++ b/mwe/events/include/eventManager.h @@ -28,6 +28,12 @@ public: void dispatchEvents(); private: +<<<<<<< HEAD + EventManager() = default; + std::vector<std::pair<std::unique_ptr<Event>, int>> eventsQueue; + std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> subscribers; + std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>> subscribersByEventId; +======= EventManager() = default; std::vector<std::pair<std::unique_ptr<Event>, int>> m_eventsQueue; std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> @@ -36,6 +42,7 @@ private: int, std::unordered_map< int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>> m_subscribersByEventId; +>>>>>>> b3b762a34e7ccb4a0dcd041a693ac7180af16002 }; template <typename EventType> |