From e53e3dae11a5904194941cfb436b2430673740d1 Mon Sep 17 00:00:00 2001 From: Alec Thomas Date: Thu, 31 Jul 2014 09:36:34 +1000 Subject: Fix warnings(?) for implicit type conversions + headers in quick.h. Fixes #43, #44. --- entityx/Entity.h | 2 +- entityx/Event.h | 2 +- entityx/quick.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/entityx/Entity.h b/entityx/Entity.h index cf6a506..e36d761 100644 --- a/entityx/Entity.h +++ b/entityx/Entity.h @@ -501,7 +501,7 @@ class EntityManager : entityx::help::NonCopyable { template ComponentHandle assign(Entity::Id id, Args && ... args) { assert_valid(id); - const int family = C::family(); + const BaseComponent::Family family = C::family(); // Placement new into the component pool. Pool *pool = accomodate_component(); new(pool->get(id.index())) C(std::forward(args) ...); diff --git a/entityx/Event.h b/entityx/Event.h index e7d7def..f830be0 100644 --- a/entityx/Event.h +++ b/entityx/Event.h @@ -159,7 +159,7 @@ class EventManager : entityx::help::NonCopyable { template void emit(Args && ... args) { E event(std::forward(args) ...); - auto sig = signal_for(E::family()); + auto sig = signal_for(size_t(E::family())); BaseEvent *base = &event; sig->emit(base); } diff --git a/entityx/quick.h b/entityx/quick.h index 9a668eb..3454b58 100644 --- a/entityx/quick.h +++ b/entityx/quick.h @@ -10,6 +10,9 @@ #pragma once +#include "entityx/Entity.h" +#include "entityx/Event.h" +#include "entityx/System.h" #include "entityx/config.h" namespace entityx { -- cgit v1.2.3