From 70771d0768aeaec2fa68517e2c38d4efa398703d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 28 Jun 2016 21:02:38 +0100 Subject: [PATCH] Temporarily remove include for vector pointer code --- src/vector.h | 148 ++++++++++++++++---------------- test/vs2015/etl.vcxproj | 1 - test/vs2015/etl.vcxproj.filters | 3 - 3 files changed, 74 insertions(+), 78 deletions(-) diff --git a/src/vector.h b/src/vector.h index 73ada799..efb650d5 100644 --- a/src/vector.h +++ b/src/vector.h @@ -134,90 +134,90 @@ namespace etl }; - //*************************************************************************** - /// A vector implementation that uses a fixed size buffer. - ///\tparam T The element type. - ///\tparam MAX_SIZE_ The maximum number of elements that can be stored. - ///\ingroup vector - //*************************************************************************** - template - class vector : public ivector - { - public: + ////*************************************************************************** + ///// A vector implementation that uses a fixed size buffer. + /////\tparam T The element type. + /////\tparam MAX_SIZE_ The maximum number of elements that can be stored. + /////\ingroup vector + ////*************************************************************************** + //template + //class vector : public ivector + //{ + //public: - static const size_t MAX_SIZE = MAX_SIZE_; + // static const size_t MAX_SIZE = MAX_SIZE_; - //************************************************************************* - /// Constructor. - //************************************************************************* - vector() - : ivector(reinterpret_cast(&buffer), MAX_SIZE) - { - ivector::initialise(); - } + // //************************************************************************* + // /// Constructor. + // //************************************************************************* + // vector() + // : ivector(reinterpret_cast(&buffer), MAX_SIZE) + // { + // ivector::initialise(); + // } - //************************************************************************* - /// Constructor, with size. - ///\param initial_size The initial size of the vector. - //************************************************************************* - explicit vector(size_t initial_size) - : ivector(reinterpret_cast(&buffer), MAX_SIZE) - { - ivector::initialise(); - ivector::resize(initial_size); - } + // //************************************************************************* + // /// Constructor, with size. + // ///\param initial_size The initial size of the vector. + // //************************************************************************* + // explicit vector(size_t initial_size) + // : ivector(reinterpret_cast(&buffer), MAX_SIZE) + // { + // ivector::initialise(); + // ivector::resize(initial_size); + // } - //************************************************************************* - /// Constructor, from initial size and value. - ///\param initial_size The initial size of the vector. - ///\param value The value to fill the vector with. - //************************************************************************* - vector(size_t initial_size, typename ivector::parameter_t value) - : ivector(reinterpret_cast(&buffer), MAX_SIZE) - { - ivector::initialise(); - ivector::resize(initial_size, value); - } + // //************************************************************************* + // /// Constructor, from initial size and value. + // ///\param initial_size The initial size of the vector. + // ///\param value The value to fill the vector with. + // //************************************************************************* + // vector(size_t initial_size, typename ivector::parameter_t value) + // : ivector(reinterpret_cast(&buffer), MAX_SIZE) + // { + // ivector::initialise(); + // ivector::resize(initial_size, value); + // } - //************************************************************************* - /// Constructor, from an iterator range. - ///\tparam TIterator The iterator type. - ///\param first The iterator to the first element. - ///\param last The iterator to the last element + 1. - //************************************************************************* - template - vector(TIterator first, TIterator last) - : ivector(reinterpret_cast(&buffer), MAX_SIZE) - { - ivector::assign(first, last); - } + // //************************************************************************* + // /// Constructor, from an iterator range. + // ///\tparam TIterator The iterator type. + // ///\param first The iterator to the first element. + // ///\param last The iterator to the last element + 1. + // //************************************************************************* + // template + // vector(TIterator first, TIterator last) + // : ivector(reinterpret_cast(&buffer), MAX_SIZE) + // { + // ivector::assign(first, last); + // } - //************************************************************************* - /// Copy constructor. - //************************************************************************* - vector(const vector& other) - : ivector(reinterpret_cast(&buffer), MAX_SIZE) - { - ivector::assign(other.begin(), other.end()); - } + // //************************************************************************* + // /// Copy constructor. + // //************************************************************************* + // vector(const vector& other) + // : ivector(reinterpret_cast(&buffer), MAX_SIZE) + // { + // ivector::assign(other.begin(), other.end()); + // } - //************************************************************************* - /// Assignment operator. - //************************************************************************* - vector& operator = (const vector& rhs) - { - if (&rhs != this) - { - ivector::assign(rhs.cbegin(), rhs.cend()); - } + // //************************************************************************* + // /// Assignment operator. + // //************************************************************************* + // vector& operator = (const vector& rhs) + // { + // if (&rhs != this) + // { + // ivector::assign(rhs.cbegin(), rhs.cend()); + // } - return *this; - } + // return *this; + // } - private: + //private: - typename etl::aligned_storage::value>::type buffer; - }; + // typename etl::aligned_storage::value>::type buffer; + //}; } #endif diff --git a/test/vs2015/etl.vcxproj b/test/vs2015/etl.vcxproj index e6d4f20f..a793636c 100644 --- a/test/vs2015/etl.vcxproj +++ b/test/vs2015/etl.vcxproj @@ -392,7 +392,6 @@ - diff --git a/test/vs2015/etl.vcxproj.filters b/test/vs2015/etl.vcxproj.filters index e1540255..8d87d7b4 100644 --- a/test/vs2015/etl.vcxproj.filters +++ b/test/vs2015/etl.vcxproj.filters @@ -788,9 +788,6 @@ Source Files - - Source Files -