aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/StdVector
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-05-07 18:38:07 +0000
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-05-07 18:38:07 +0000
commitc8a22dbc08ebe8bcde7bf7717b09736bd3e1b46f (patch)
treecea9a76a550b240c66884f3768183926ea9b4101 /Eigen/StdVector
parent159ab4a043cb82642a589a6c833d26e55d355a54 (diff)
CREDIT Hauke Heibel, more std::vector::insert fixes
Diffstat (limited to 'Eigen/StdVector')
-rw-r--r--Eigen/StdVector12
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/StdVector b/Eigen/StdVector
index 3213afeaa..055295939 100644
--- a/Eigen/StdVector
+++ b/Eigen/StdVector
@@ -95,6 +95,7 @@ namespace std {
typedef typename vector_base::allocator_type allocator_type; \
typedef typename vector_base::size_type size_type; \
typedef typename vector_base::iterator iterator; \
+ typedef typename vector_base::const_iterator const_iterator; \
explicit vector(const allocator_type& a = allocator_type()) : vector_base(a) {} \
template<typename InputIterator> \
vector(InputIterator first, InputIterator last, const allocator_type& a = allocator_type()) \
@@ -129,13 +130,12 @@ class vector<T,Eigen::aligned_allocator<T> >
vector_base::erase(vector_base::begin() + new_size, vector_base::end());
}
void push_back(const value_type& x)
- { vector_base::push_back(x); }
- template<class _Iter> void insert(const_iterator position, _Iter first, _Iter last)
- { return vector_base::insert(position, first, last); }
- iterator insert(iterator position, const value_type& x)
+ { vector_base::push_back(x); }
+ using vector_base::insert;
+ iterator insert(const_iterator position, const value_type& x)
{ return vector_base::insert(position,x); }
- iterator insert(iterator position, size_type new_size, const value_type& x)
- { return vector_base::insert(position, new_size, x); }
+ void insert(const_iterator position, size_type new_size, const value_type& x)
+ { vector_base::insert(position, new_size, x); }
#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&),