12 Commits

Author SHA1 Message Date
joaquintides
a52810fc3d
implemented merge operations (#49)
* initial draft

* modified appveyor.yml for this branch

* dropped BOOST_RV_REF
as it doesn't handle lvalue refs

* befriended index_base from all indices
so as to be grant access to final_extract_for_merge_ from an external container

* added rvalue ref merge
(test expected to fail in C++03)

* added explicit boost::move on rvalue ref
for the benefit of C++03 compilers

* fixed previous workaround

* refactored merge algorithm into multi_index_container

* added hashed_index::merge

* reimplemented sequenced_index::splice(position,x)

* added missing this->'s

* refactored SFINAEing code

* made sequenced_index::splice(position,x) exception robust

* reimplemented random_access_index::splice(position,x)

* micro-optimized legacy code in random_access_index::splice(position,x)

* added missing #include

* reimplemented sequenced_index::splice(position,x,i)

* reimplemented random_access_index::splice(position,x,i)

* reimplemented sequenced_index::splice(position,x,first,last)

* reimplemented random_access_index::splice(position,x,first,last)

* re-engineered sequenced_index::splice(position,x,i)
so that it works when source and destination belong to the same container

* stylistic

* re-engineered random_access_index::splice(position,x,i)
so that it works when source and destination belong to the same container

* re-engineered sequenced_index::splice(position,x,first,last)
so that it works when source and destination belong to the same container

* stylistic

* fixed bug in rvalue ref overload of sequenced_index::splice(position,x,first,last)

* fixed internal sequenced_index::splice(position,x,first,last) across different indices

* re-engineered random_access_index::splice(position,x,first,last)
the same way as done with sequenced_index

* replaced multi_index_container::merge_ with transfer_range_
so as to refactor some code in non-key-based indices

* fixed safe mode check for different-type containers

* hardened merge/splice tests

* s/BOOST_RV_REF/BOOST_FWD_REF

* called the right merge_different overload

* fixed problem with Boost.Move C++03 perfect fwd emulation

* updated (C) year

* allowed intra-container full splice

* required position==end() in intra-container full splice

* made pointwise splice return a pair<iterator,bool>

* added partial merge functionality to key-based indices
plus fixed a compile-time error with legacy splice code when applied to different-type indices

* suppressed unused variable

* fixed wrong signature in splice memfun

* made safe-mode iterators SCARY

* refactored any_container_view

* implemented safe iterator transfer in merge/splice

* reorganized internal deps

* stylistic

* automatically checked iterator invalidation upon merge/splice

* removed commented-out code

* checked allocator equality

* reimplemented random_access_index internal, cross-index splice in linear time

* updated docs

* reverted appveyor.yml
2021-08-19 10:41:03 +02:00
joaquintides
86d7b3ef6e copied content from develop after wrongly made merge 2013-12-25 12:36:32 +01:00
Joaquín M López Muñoz
0f583940c9 merged [82897], [82970] and [82993] from trunk
[SVN r83003]
2013-02-19 14:49:33 +00:00
Joaquín M López Muñoz
eb1f2a98b7 merged [59582] from trunk
[SVN r59638]
2010-02-11 19:28:27 +00:00
Joaquín M López Muñoz
3199ff1b44 merged up to [53676] from trunk
[SVN r53730]
2009-06-07 18:44:00 +00:00
Joaquín M López Muñoz
bd8ea1bc86 merged up to rev. 47041 from trunk
[SVN r47045]
2008-07-03 16:51:53 +00:00
Joaquín M. López Muñoz
add267a90a merged from trunk to branch
[SVN r36776]
2007-01-24 18:21:23 +00:00
Joaquín M. López Muñoz
e46279d9ec merged from trunk to branch
[SVN r35444]
2006-10-02 15:20:03 +00:00
Joaquín M. López Muñoz
f9c9851ef3 added workaround for CW 8.3
[SVN r33313]
2006-03-10 15:19:52 +00:00
Joaquín M. López Muñoz
7274eca56c added random access indices
[SVN r32669]
2006-02-06 15:52:21 +00:00
Joaquín M. López Muñoz
eb2a1dbca3 license update
[SVN r22959]
2004-05-28 08:06:41 +00:00
Joaquín M. López Muñoz
b35bef74e4 initial commit
[SVN r22759]
2004-05-07 10:44:23 +00:00