townforge/poly_collection
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

workaround for old versions of libstdc++ with pre-C++11 std::vector member function signatures

Browse Source
This commit is contained in:
joaquintides 2017-06-11 20:29:05 +02:00
parent 1c679d3286
commit a769a6826e
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/boost/poly_collection/detail/packed_segment.hpp
View File

@ -1,4 +1,4 @@
/* Copyright 2016 Joaquin M Lopez Munoz.
/* Copyright 2016-2017 Joaquin M Lopez Munoz.
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
@ -49,6 +49,7 @@ class packed_segment:public segment_backend<Model>
typename std::allocator_traits<Allocator>::
template rebind_alloc<store_value_type>
>;
using store_iterator=typename store::iterator;
using const_store_iterator=typename store::const_iterator;
using segment_backend=detail::segment_backend<Model>;
using typename segment_backend::value_pointer;
@ -212,14 +213,20 @@ private:
return Model::element_ptr(const_concrete_ptr(p));
}
const_store_iterator iterator_from(const_base_iterator p)const
/* It would have sufficed if iterator_from returned const_store_iterator
* except for the fact that some old versions of libstdc++ claiming to be
* C++11 compliant do not however provide std::vector modifier ops taking
* const_iterator's.
*/
store_iterator iterator_from(const_base_iterator p)
{
return iterator_from(
static_cast<const Concrete*>(
static_cast<const_iterator<Concrete>>(p)));
}
const_store_iterator iterator_from(position_pointer p)const
store_iterator iterator_from(position_pointer p)
{
return s.begin()+(const_store_value_type_ptr(p)-s.data());
}

11
include/boost/poly_collection/detail/split_segment.hpp
View File

@ -51,6 +51,7 @@ class split_segment:public segment_backend<Model>
template rebind_alloc<value_holder<Concrete>>
>;
using store_value_type=typename store::value_type;
using store_iterator=typename store::iterator;
using const_store_iterator=typename store::const_iterator;
using index=std::vector<
value_type,
@ -359,12 +360,18 @@ private:
return const_cast<value_type*>(p);
}
const_store_iterator iterator_from(const_base_iterator p)const
/* It would have sufficed if iterator_from returned const_store_iterator
* except for the fact that some old versions of libstdc++ claiming to be
* C++11 compliant do not however provide std::vector modifier ops taking
* const_iterator's.
*/
store_iterator iterator_from(const_base_iterator p)
{
return s.begin()+(p-i.data());
}
const_store_iterator iterator_from(position_pointer p)const
store_iterator iterator_from(position_pointer p)
{
return s.begin()+(const_concrete_ptr(p)-const_concrete_ptr(s.data()));
}