diff options
| -rw-r--r-- | CHANGELOG.md (renamed from CHANGES.md) | 0 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | entityx/Event.h | 7 | ||||
| -rw-r--r-- | entityx/python/PythonSystem.h | 6 | ||||
| -rw-r--r-- | entityx/python/entityx/tests/deep_subclass_test.py | 4 |
6 files changed, 11 insertions, 14 deletions
diff --git a/CHANGES.md b/CHANGELOG.md index acc0008..acc0008 100644 --- a/CHANGES.md +++ b/CHANGELOG.md diff --git a/CMakeLists.txt b/CMakeLists.txt index 23206e7..e53de9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,7 @@ require(HAVE_STDINT_H "stdint.h") set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_RUNTIME OFF) +find_package(Boost 1.48.0 REQUIRED COMPONENTS signals) find_package(Boost 1.48.0 COMPONENTS python) include_directories(${Boost_INCLUDE_DIR}) @@ -134,7 +135,7 @@ if (Boost_PYTHON_LIBRARY) endif (Boost_PYTHON_LIBRARY) if (ENTITYX_BUILD_TESTING) - find_package(Boost 1.48.0 REQUIRED COMPONENTS timer system) + find_package(Boost 1.48.0 REQUIRED COMPONENTS signals timer system) add_subdirectory(gtest-1.6.0) include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR}) enable_testing() @@ -15,11 +15,10 @@ You can also contact me directly via [email](mailto:alec@swapoff.org) or [Twitte ## Recent Notable Changes -- 2013-08-21 - Switch to `boost::signals2`. - 2013-08-18 - Destroying an entity invalidates all other references - 2013-08-17 - Python scripting, and a more robust build system -See the [ChangeLog](https://github.com/alecthomas/entityx/blob/master/CHANGES.md) for details. +See the [ChangeLog](https://github.com/alecthomas/entityx/blob/master/CHANGELOG.md) for details. ## Overview @@ -256,7 +255,7 @@ EntityX has the following build and runtime requirements: - A C++ compiler that supports a basic set of C++11 features (ie. recent clang, recent gcc, and maybe (untested) VC++ with the [Nov 2012 CTP](http://www.microsoft.com/en-us/download/details.aspx?id=35515)). - [CMake](http://cmake.org/) -- [Boost](http://boost.org) `1.48.0` or higher (links against `boost::signals2`). +- [Boost](http://boost.org) `1.48.0` or higher (links against `boost::signals`). Once these dependencies are installed you should be able to build and install EntityX as below. The following options can be passed to cmake to modify how EntityX is built: diff --git a/entityx/Event.h b/entityx/Event.h index 040306c..8d3de61 100644 --- a/entityx/Event.h +++ b/entityx/Event.h @@ -14,9 +14,8 @@ #include <boost/bind.hpp> #include <boost/function.hpp> #include <boost/noncopyable.hpp> -#include <boost/signals2.hpp> +#include <boost/signal.hpp> #include <boost/unordered_map.hpp> -#include <list> #include "entityx/config.h" @@ -67,7 +66,7 @@ class BaseReceiver { private: friend class EventManager; - std::list<boost::signals2::connection> connections_; + std::list<boost::signals::connection> connections_; }; @@ -132,7 +131,7 @@ class EventManager : public entityx::enable_shared_from_this<EventManager>, boos } private: - typedef boost::signals2::signal<void (const BaseEvent*)> EventSignal; + typedef boost::signal<void (const BaseEvent*)> EventSignal; typedef entityx::shared_ptr<EventSignal> EventSignalPtr; EventManager() {} diff --git a/entityx/python/PythonSystem.h b/entityx/python/PythonSystem.h index 5c6333c..7001f23 100644 --- a/entityx/python/PythonSystem.h +++ b/entityx/python/PythonSystem.h @@ -23,9 +23,9 @@ namespace std { // This may or may not work... it definitely does not work on OSX. -// template <class T> inline T * get_pointer(const std::shared_ptr<T> &p) { -// return p.get(); -// } +template <class T> inline T * get_pointer(const std::shared_ptr<T> &p) { + return p.get(); +} } diff --git a/entityx/python/entityx/tests/deep_subclass_test.py b/entityx/python/entityx/tests/deep_subclass_test.py index 801b487..9c576b2 100644 --- a/entityx/python/entityx/tests/deep_subclass_test.py +++ b/entityx/python/entityx/tests/deep_subclass_test.py @@ -21,6 +21,4 @@ class DeepSubclassTest2(DeepSubclassTest): assert self.direction assert self.position assert self.position2 - assert self.position.x == self.position2.x and self.position.y == self.position2.y - self.position.x += 1 - assert self.position.x == self.position2.x and self.position.y == self.position2.y + assert self.position is self.position2 |