GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-15 05:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix ctor issues with ei_workaround_msvc_std_vector

Browse Source
This commit is contained in:
Gael Guennebaud 2009-04-21 08:12:07 +00:00
parent b14d1139df
commit 4efcc14b91
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Eigen/StdVector
View File

@ -3,7 +3,7 @@
#if defined(_GLIBCXX_VECTOR) || defined(_VECTOR_) #if defined(_GLIBCXX_VECTOR) || defined(_VECTOR_)
#error you must include Eigen/StdVector before std::vector #error you must include Eigen/StdVector before std::vector
#endif #endif
#ifndef EIGEN_GNUC_AT_LEAST #ifndef EIGEN_GNUC_AT_LEAST
#ifdef __GNUC__ #ifdef __GNUC__
@ -14,7 +14,7 @@
#endif #endif
#define vector std_vector #define vector std_vector
#include <vector> #include <vector>
#undef vector #undef vector
namespace Eigen { namespace Eigen {
@ -34,12 +34,12 @@ struct ei_has_aligned_operator_new {
test(...); test(...);
// note that the following indirection is needed for gcc-3.3 // note that the following indirection is needed for gcc-3.3
enum {ret = sizeof(test(static_cast<ClassType*>(0))) enum {ret = sizeof(test(static_cast<ClassType*>(0)))
== sizeof(ei_has_aligned_operator_new_marker_sizeof) }; == sizeof(ei_has_aligned_operator_new_marker_sizeof) };
}; };
#ifdef _MSC_VER #ifdef _MSC_VER
// sometimes, MSVC detects, at compile time, that the argument x // sometimes, MSVC detects, at compile time, that the argument x
// in std::vector::resize(size_t s,T x) won't be aligned and generate an error // in std::vector::resize(size_t s,T x) won't be aligned and generate an error
// even if this function is never called. Whence this little wrapper. // even if this function is never called. Whence this little wrapper.
@ -94,38 +94,45 @@ class vector : public std::std_vector<T,AllocT>
template<typename T,typename DummyAlloc> template<typename T,typename DummyAlloc>
class vector<T,DummyAlloc,true> class vector<T,DummyAlloc,true>
: public std::std_vector<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T), : public std::std_vector<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T),
Eigen::aligned_allocator<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T)> > Eigen::aligned_allocator<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T)> >
{ {
typedef std_vector<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T), typedef std_vector<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T),
Eigen::aligned_allocator<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T)> > vector_base; Eigen::aligned_allocator<_EIGEN_WORKAROUND_MSVC_STD_VECTOR(T)> > vector_base;
EIGEN_STD_VECTOR_SPECIALIZATION_BODY EIGEN_STD_VECTOR_SPECIALIZATION_BODY
void resize(size_type __new_size) void resize(size_type __new_size)
{ resize(__new_size, T()); } { resize(__new_size, T()); }
#if defined(_VECTOR_) #if defined(_VECTOR_)
// workaround MSVC std::vector implementation // workaround MSVC std::vector implementation
void resize(size_type __new_size, const value_type& __x) void resize(size_type __new_size, const value_type& __x)
{ {
if (vector_base::size() < __new_size) if (vector_base::size() < __new_size)
vector_base::_Insert_n(vector_base::end(), __new_size - vector_base::size(), __x); vector_base::_Insert_n(vector_base::end(), __new_size - vector_base::size(), __x);
else if (__new_size < vector_base::size()) else if (__new_size < vector_base::size())
vector_base::erase(vector_base::begin() + __new_size, vector_base::end()); vector_base::erase(vector_base::begin() + __new_size, vector_base::end());
} }
void push_back(const value_type& __x)
{ vector_base::push_back(__x); }
iterator insert(iterator __position, const value_type& __x)
{ return vector_base::insert(__position,__x); }
iterator insert(iterator __position, size_type __n, const value_type& __x)
{ return vector_base::insert(__position, __n, __x); }
#elif defined(_GLIBCXX_VECTOR) && EIGEN_GNUC_AT_LEAST(4,1) #elif defined(_GLIBCXX_VECTOR) && EIGEN_GNUC_AT_LEAST(4,1)
// workaround GCC std::vector implementation // workaround GCC std::vector implementation
// Note that before gcc-4.1 we already have: std::vector::resize(size_type,const T&), // Note that before gcc-4.1 we already have: std::vector::resize(size_type,const T&),
// no no need to workaround ! // no no need to workaround !
void resize(size_type __new_size, const value_type& __x) void resize(size_type __new_size, const value_type& __x)
{ {
if (__new_size < vector_base::size()) if (__new_size < vector_base::size())
vector_base::_M_erase_at_end(this->_M_impl._M_start + __new_size); vector_base::_M_erase_at_end(this->_M_impl._M_start + __new_size);
else else
vector_base::insert(vector_base::end(), __new_size - vector_base::size(), __x); vector_base::insert(vector_base::end(), __new_size - vector_base::size(), __x);
} }
#else #else
using vector_base::resize; using vector_base::resize;
#endif #endif
}; };
} }