diff options
author | Alec Thomas <alec@swapoff.org> | 2013-03-20 07:44:31 -0700 |
---|---|---|
committer | Alec Thomas <alec@swapoff.org> | 2013-03-20 07:44:31 -0700 |
commit | 824b32a692c8a0702de23301e11b8a2a7078697b (patch) | |
tree | 7d195d10d90f149244902c00a358349492d265e7 | |
parent | 26864aaf41dc4465595eed597db9f5588a30a268 (diff) | |
parent | 676c636bd3350cb29cda576cbe456d1fb9f2eb38 (diff) |
Merge pull request #4 from larspensjo/gcc-static
gcc 4.7.2 doesn't allow static keyword in member function definition.
-rw-r--r-- | entityx/Entity.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/entityx/Entity.h b/entityx/Entity.h index 3f96628..0e6d861 100644 --- a/entityx/Entity.h +++ b/entityx/Entity.h @@ -522,7 +522,7 @@ class EntityManager : boost::noncopyable { }; template <typename C> -static BaseComponent::Family Component<C>::family() { +BaseComponent::Family Component<C>::family() { static Family family = family_counter_++; assert(family < EntityManager::MAX_COMPONENTS); return family; |