From 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 Mon Sep 17 00:00:00 2001 From: Antony Woods Date: Tue, 29 Oct 2013 18:25:31 +0000 Subject: Tidying up and amending readme/changes --- CHANGES.md | 4 ++++ README.md | 2 +- entityx/config.h.in | 27 ++------------------------- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6660d33..706d0f2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Change Log +## 2013-10-29 [no-boost branch] - Removed boost dependency for everything except python integration. + +This branch requires C++11 support and has removed all the non-boost::python dependecies, reducing the overhead of running entityx. + ## 2013-08-22 - Remove `boost::signal` and switch to `Simple::Signal`. According to the [benchmarks](http://timj.testbit.eu/2013/cpp11-signal-system-performance/) Simple::Signal is an order of magnitude faster than `boost::signal`. Additionally, `boost::signal` is now deprecated in favor of `boost::signal2`, which is not supported on versions of Boost on a number of platforms. diff --git a/README.md b/README.md index 2ac8772..4e831e6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # EntityX - A fast, type-safe C++ Entity Component System -(No Boost Branch) [![Build Status](https://travis-ci.org/alecthomas/entityx.png)](https://travis-ci.org/alecthomas/entityx) @@ -16,6 +15,7 @@ You can also contact me directly via [email](mailto:alec@swapoff.org) or [Twitte ## Recent Notable Changes +- 2013-10-29 - The 'no-boost' branch now exists to remove boost as a dependency for builds not using python. - 2013-08-21 - Remove dependency on `boost::signal` and switch to embedded [Simple::Signal](http://timj.testbit.eu/2013/cpp11-signal-system-performance/). - 2013-08-18 - Destroying an entity invalidates all other references - 2013-08-17 - Python scripting, and a more robust build system diff --git a/entityx/config.h.in b/entityx/config.h.in index 5567cae..49bc2ba 100644 --- a/entityx/config.h.in +++ b/entityx/config.h.in @@ -5,7 +5,6 @@ #cmakedefine ENTITYX_INSTALLED_PYTHON_PACKAGE_DIR "@ENTITYX_INSTALLED_PYTHON_PACKAGE_DIR@" #cmakedefine ENTITYX_NEED_GET_POINTER_SHARED_PTR_SPECIALIZATION "@ENTITYX_NEED_GET_POINTER_SHARED_PTR_SPECIALIZATION@" -#define ENTITYX_USE_STD_SHARED_PTR 1 #define ENTITYX_HAVE_STD_SHARED_PTR 1 #include @@ -19,7 +18,7 @@ static const uint64_t MAX_COMPONENTS = ENTITYX_MAX_COMPONENTS; // Which shared_ptr implementation should we use? -#if (ENTITYX_HAVE_STD_SHARED_PTR && ENTITYX_USE_STD_SHARED_PTR) +#if (ENTITYX_HAVE_STD_SHARED_PTR) #include @@ -38,31 +37,9 @@ using enable_shared_from_this = std::enable_shared_from_this; } // namespace entityx -#elif ENTITYX_HAVE_BOOST_SHARED_PTR - -#include -#include -#include - - -namespace entityx { - -template -using ptr = boost::shared_ptr; -template -using weak_ptr = boost::weak_ptr; -template -ptr static_pointer_cast(const ptr &ptr) { - return boost::static_pointer_cast(ptr); -} -template -using enable_shared_from_this = boost::enable_shared_from_this; - -} // namespace entityx - #else -#warning "Don't have a boost or std shared_ptr implementation to use" +#warning "Don't have a std shared_ptr implementation to use" #endif -- cgit v1.2.3