From 94ff892d5caceba83b53e073fafb339afdd90ecb Mon Sep 17 00:00:00 2001 From: kumar8600 Date: Mon, 13 Oct 2014 16:55:41 +0900 Subject: Return std::size_t at Event::connected_signals And size_t -> std::size_t --- entityx/Event.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/entityx/Event.h b/entityx/Event.h index 142c758..53afd7d 100644 --- a/entityx/Event.h +++ b/entityx/Event.h @@ -27,7 +27,7 @@ namespace entityx { /// Used internally by the EventManager. class BaseEvent { public: - typedef size_t Family; + typedef std::size_t Family; virtual ~BaseEvent() {} @@ -76,8 +76,8 @@ class BaseReceiver { } // Return number of signals connected to this receiver. - size_t connected_signals() const { - size_t size = 0; + std::size_t connected_signals() const { + std::size_t size = 0; for (auto connection : connections_) { if (!connection.first.expired()) { size++; @@ -88,7 +88,7 @@ class BaseReceiver { private: friend class EventManager; - std::list> connections_; + std::list> connections_; }; @@ -160,7 +160,7 @@ class EventManager : entityx::help::NonCopyable { template void emit(Args && ... args) { E event(std::forward(args) ...); - auto sig = signal_for(size_t(E::family())); + auto sig = signal_for(std::size_t(E::family())); BaseEvent *base = &event; sig->emit(base); } @@ -174,7 +174,7 @@ class EventManager : entityx::help::NonCopyable { } private: - EventSignalPtr &signal_for(size_t id) { + EventSignalPtr &signal_for(std::size_t id) { if (id >= handlers_.size()) handlers_.resize(id + 1); if (!handlers_[id]) -- cgit v1.2.3