diff --git a/src/lol/base/array.h b/src/lol/base/array.h index a297b30d..bac6106b 100644 --- a/src/lol/base/array.h +++ b/src/lol/base/array.h @@ -32,16 +32,6 @@ namespace lol static ptrdiff_t const INDEX_NONE = -1; -/* - * Sorting algorithm list - */ - -enum class SortAlgorithm : uint8_t -{ - QuickSwap, - Bubble, -}; - /* * The base array type. * @@ -368,11 +358,7 @@ public: m_reserved = toreserve; } - void shuffle(); - - void sort(SortAlgorithm algorithm); - - /* Support C++11 range-based for loops */ + // Support C++11 range-based for loops class const_iterator { public: @@ -455,25 +441,13 @@ protected: template class array : public array_base, array> { -public: - /* GCC needs this but Clang doesn’t */ - typedef std::tuple element_t; - -#if LOL_FEATURE_CXX11_INHERIT_CONSTRUCTORS private: using array_base, array>::array_base; -#else -public: - inline array() - : array_base>::array_base() - {} - - inline array(std::initializer_list const &list) - : array_base>::array_base(list) - {} -#endif public: + // GCC needs this but Clang doesn’t + typedef std::tuple element_t; + inline void push(T... args) { if (this->m_count >= this->m_reserved) @@ -510,20 +484,7 @@ template class array : public array_base> { -#if LOL_FEATURE_CXX11_INHERIT_CONSTRUCTORS using array_base>::array_base; -#else -public: - typedef T element_t; - - inline array() - : array_base>::array_base() - {} - - inline array(std::initializer_list const &list) - : array_base>::array_base(list) - {} -#endif }; /*