diff options
author | Antony Woods <acron1@gmail.com> | 2013-11-01 08:20:46 +0000 |
---|---|---|
committer | Antony Woods <acron1@gmail.com> | 2013-11-01 08:20:46 +0000 |
commit | a5247cfd2a63ac4ef4820a61d43af0fb10f722ae (patch) | |
tree | 6f6280501058815e1b1058f54636529cee85159d | |
parent | 9119c560108b4640e4e55e91d9066ec59d23e251 (diff) |
Tidied up config.h.in to remove redundant guard
-rw-r--r-- | entityx/config.h.in | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/entityx/config.h.in b/entityx/config.h.in index 934fadc..f57794e 100644 --- a/entityx/config.h.in +++ b/entityx/config.h.in @@ -5,8 +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_HAVE_STD_SHARED_PTR 1 - #include <stdint.h> #include "entityx/config.h" @@ -14,16 +12,8 @@ namespace entityx { static const uint64_t MAX_COMPONENTS = ENTITYX_MAX_COMPONENTS; -} // namespace entityx - - -// Which shared_ptr implementation should we use? -#if (ENTITYX_HAVE_STD_SHARED_PTR) - #include <memory> -namespace entityx { - template <typename T> using ptr = std::shared_ptr<T>; template <typename T> @@ -35,17 +25,6 @@ ptr<U> static_pointer_cast(const ptr<T> &ptr) { template <typename T> using enable_shared_from_this = std::enable_shared_from_this<T>; -} // namespace entityx - -#else - -#warning "Don't have a std shared_ptr implementation to use" - -#endif - - -namespace entityx { - template <typename T> bool operator == (const weak_ptr<T> &a, const weak_ptr<T> &b) { return a.lock() == b.lock(); |