mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-15 07:10:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

disable vector::resize() workaround for gcc < 4.1 (they already use a const

Browse Source 
reference)
This commit is contained in:
Gael Guennebaud 2009-02-07 12:46:04 +00:00
parent 671398372b
commit 365ec0744c
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Eigen/StdVector
View File

@ -95,15 +95,8 @@ class vector<T,DummyAlloc,true>
void resize(size_type __new_size) void resize(size_type __new_size)
{ resize(__new_size, T()); } { resize(__new_size, T()); }
#if defined(_GLIBCXX_VECTOR) #if defined(_VECTOR_)
void resize(size_type __new_size, const value_type& __x) // workaround MSVC std::vector implementation
{
if (__new_size < vector_base::size())
vector_base::_M_erase_at_end(this->_M_impl._M_start + __new_size);
else
vector_base::insert(vector_base::end(), __new_size - vector_base::size(), __x);
}
#elif defined(_VECTOR_)
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)
@ -111,6 +104,18 @@ class vector<T,DummyAlloc,true>
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());
} }
#elif defined(_GLIBCXX_VECTOR) && EIGEN_GNUC_AT_LEAST(4,1)
// workaround GCC std::vector implementation
// Note that before gcc-4.1 we already have: std::vector::resize(size_type,const T&),
// no no need to workaround !
void resize(size_type __new_size, const value_type& __x)
{
if (__new_size < vector_base::size())
vector_base::_M_erase_at_end(this->_M_impl._M_start + __new_size);
else
vector_base::insert(vector_base::end(), __new_size - vector_base::size(), __x);
}
#endif #endif
}; };