diff options
| -rw-r--r-- | entityx/Components.h | 2 | ||||
| -rw-r--r-- | entityx/Components_test.cc | 2 | ||||
| -rw-r--r-- | entityx/Entity.cc | 2 | ||||
| -rw-r--r-- | entityx/Entity.h | 2 | ||||
| -rw-r--r-- | entityx/Entity_test.cc | 2 | ||||
| -rw-r--r-- | entityx/Event.cc | 2 | ||||
| -rw-r--r-- | entityx/Event.h | 2 | ||||
| -rw-r--r-- | entityx/Event_test.cc | 2 | ||||
| -rw-r--r-- | entityx/Manager.cc | 2 | ||||
| -rw-r--r-- | entityx/Manager.h | 2 | ||||
| -rw-r--r-- | entityx/System.cc | 2 | ||||
| -rw-r--r-- | entityx/System.h | 2 | ||||
| -rw-r--r-- | entityx/System_test.cc | 4 |
13 files changed, 14 insertions, 14 deletions
diff --git a/entityx/Components.h b/entityx/Components.h index 8c96fa7..cbc74d9 100644 --- a/entityx/Components.h +++ b/entityx/Components.h @@ -14,7 +14,7 @@ #include <boost/unordered_set.hpp> #include "entityx/Entity.h" -namespace entity { +namespace entityx { /** * Allow entities to be tagged with strings. diff --git a/entityx/Components_test.cc b/entityx/Components_test.cc index e32fb46..bb9ae5d 100644 --- a/entityx/Components_test.cc +++ b/entityx/Components_test.cc @@ -13,7 +13,7 @@ using namespace std; using namespace boost; -using namespace entity; +using namespace entityx; struct Position : public Component<Position> {}; diff --git a/entityx/Entity.cc b/entityx/Entity.cc index fefc1cd..89a83f7 100644 --- a/entityx/Entity.cc +++ b/entityx/Entity.cc @@ -11,7 +11,7 @@ #include <algorithm> #include "entityx/Entity.h" -namespace entity { +namespace entityx { BaseComponent::Family BaseComponent::family_counter_ = 0; diff --git a/entityx/Entity.h b/entityx/Entity.h index 013830e..b90abe7 100644 --- a/entityx/Entity.h +++ b/entityx/Entity.h @@ -25,7 +25,7 @@ #include <glog/logging.h> #include "entityx/Event.h" -namespace entity { +namespace entityx { /** * Entity handle. diff --git a/entityx/Entity_test.cc b/entityx/Entity_test.cc index 805a3d3..1433b26 100644 --- a/entityx/Entity_test.cc +++ b/entityx/Entity_test.cc @@ -18,7 +18,7 @@ using namespace std; using namespace boost; -using namespace entity; +using namespace entityx; template <typename T> diff --git a/entityx/Event.cc b/entityx/Event.cc index 484a17c..aac7145 100644 --- a/entityx/Event.cc +++ b/entityx/Event.cc @@ -10,7 +10,7 @@ #include "entityx/Event.h" -namespace entity { +namespace entityx { BaseEvent::Family BaseEvent::family_counter_ = 0; diff --git a/entityx/Event.h b/entityx/Event.h index ac6a632..a599b90 100644 --- a/entityx/Event.h +++ b/entityx/Event.h @@ -19,7 +19,7 @@ #include <boost/unordered_map.hpp> -namespace entity { +namespace entityx { /// Used internally by the EventManager. diff --git a/entityx/Event_test.cc b/entityx/Event_test.cc index 63b0529..91bdd16 100644 --- a/entityx/Event_test.cc +++ b/entityx/Event_test.cc @@ -14,7 +14,7 @@ #include <gtest/gtest.h> #include "entityx/Event.h" -using namespace entity; +using namespace entityx; using namespace boost; struct Explosion : public Event<Explosion> { diff --git a/entityx/Manager.cc b/entityx/Manager.cc index 012e06f..22bf6ba 100644 --- a/entityx/Manager.cc +++ b/entityx/Manager.cc @@ -10,7 +10,7 @@ #include "Manager.h" -namespace entity { +namespace entityx { void Manager::start() { configure(); diff --git a/entityx/Manager.h b/entityx/Manager.h index 66ace3f..cca3ff1 100644 --- a/entityx/Manager.h +++ b/entityx/Manager.h @@ -15,7 +15,7 @@ #include "entityx/Event.h" #include "entityx/System.h" -namespace entity { +namespace entityx { class Manager { public: diff --git a/entityx/System.cc b/entityx/System.cc index 4c05f2b..399371c 100644 --- a/entityx/System.cc +++ b/entityx/System.cc @@ -10,7 +10,7 @@ #include "entityx/System.h" -namespace entity { +namespace entityx { BaseSystem::Family BaseSystem::family_counter_; diff --git a/entityx/System.h b/entityx/System.h index a754352..c7da41d 100644 --- a/entityx/System.h +++ b/entityx/System.h @@ -20,7 +20,7 @@ #include "entityx/Event.h" -namespace entity { +namespace entityx { /** * Base System class. Generally should not be directly used, instead see System<Derived>. diff --git a/entityx/System_test.cc b/entityx/System_test.cc index 2dad4d9..42312d3 100644 --- a/entityx/System_test.cc +++ b/entityx/System_test.cc @@ -18,7 +18,7 @@ using namespace std; using namespace boost; -using namespace entity; +using namespace entityx; struct Position : Component<Position> { Position(float x = 0.0f, float y = 0.0f) : x(x), y(y) {} @@ -52,7 +52,7 @@ class MovementSystem : public System<MovementSystem> { }; -class TestManager : public entity::Manager { +class TestManager : public entityx::Manager { public: std::vector<Entity> entities; |