boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 22:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

add support for std::initialize_list in stable_vector constructor, operator=, assign and insert methods

Browse Source
This commit is contained in:
Robert Matusewicz
2014-08-15 15:32:07 +02:00
parent 717959061e
commit d0f8fe793c
2 changed files with 108 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
include/boost/container/stable_vector.hpp
View File

@@ -56,6 +56,10 @@
namespace boost {
namespace container {
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
#include <initializer_list>
#endif
#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
namespace stable_vector_detail{
@@ -628,6 +632,24 @@ class stable_vector
cod.release();
}
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
//! <b>Effects</b>: Constructs a stable_vector that will use a copy of allocator a
//! and inserts a copy of the range [il.begin(), il.last()) in the stable_vector
//!
//! <b>Throws</b>: If allocator_type's default constructor
//! throws or T's constructor taking a dereferenced initializer_list iterator throws.
//!
//! <b>Complexity</b>: Linear to the range [il.begin(), il.end()).
stable_vector(std::initializer_list<value_type> il, const allocator_type& l = allocator_type())
: internal_data(l), index(l)
{
stable_vector_detail::clear_on_destroy<stable_vector> cod(*this);
insert(cend(), il.begin(), il.end())
STABLE_VECTOR_CHECK_INVARIANT;
cod.release();
}
#endif
//! <b>Effects</b>: Move constructor. Moves mx's resources to *this.
//!
//! <b>Throws</b>: If allocator_type's copy constructor throws.
@@ -753,6 +775,20 @@ class stable_vector
return *this;
}
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
//! <b>Effects</b>: Make *this container contains elements from il.
//!
//! <b>Complexity</b>: Linear to the range [il.begin(), il.end()).
stable_vector& operator=(std::initializer_list<value_type> il)
{
STABLE_VECTOR_CHECK_INVARIANT;
clear();
shrink_to_fit();
assign(il.begin(), il.end());
return *this;
}
#endif
//! <b>Effects</b>: Assigns the n copies of val to *this.
//!
//! <b>Throws</b>: If memory allocation throws or T's copy constructor throws.
@@ -792,6 +828,19 @@ class stable_vector
}
}
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
//! <b>Effects</b>: Assigns the the range [il.begin(), il.end()) to *this.
//!
//! <b>Throws</b>: If memory allocation throws or
//! T's constructor from dereferencing initializer_list iterator throws.
//!
void assign(std::initializer_list<value_type> il)
{
STABLE_VECTOR_CHECK_INVARIANT;
assign(il.begin(), il.end());
}
#endif
//! <b>Effects</b>: Returns a copy of the internal allocator.
//!
//! <b>Throws</b>: If allocator's copy constructor throws.
@@ -1345,6 +1394,21 @@ class stable_vector
return this->insert(position, cvalue_iterator(t, n), cvalue_iterator());
}
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
//! <b>Requires</b>: position must be a valid iterator of *this.
//!
//! <b>Effects</b>: Insert a copy of the [il.begin(), il.end()) range before position.
//!
//! <b>Returns</b>: an iterator to the first inserted element or position if first == last.
//!
//! <b>Complexity</b>: Linear to std::distance [il.begin(), il.end()).
iterator insert(const_iterator position, std::initializer_list<value_type> il)
{
STABLE_VECTOR_CHECK_INVARIANT;
return insert(position, il.begin(), il.end());
}
#endif
//! <b>Requires</b>: pos must be a valid iterator of *this.
//!
//! <b>Effects</b>: Insert a copy of the [first, last) range before pos.

44
test/stable_vector_test.cpp
View File

@@ -112,6 +112,44 @@ int test_cont_variants()
return 0;
}
bool test_methods_with_initializer_list_as_argument()
{
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
{
const stable_vector<int> testedVector = {1, 2, 3};
const std::vector<int> expectedVector = {1, 2, 3};
if(!test::CheckEqualContainers(&testedVector, &expectedVector)) return false;
}
{
stable_vector<int> testedVector = {1, 2, 3};
testedVector = {11, 12, 13};
const std::vector<int> expectedVector = {11, 12, 13};
if(!test::CheckEqualContainers(&testedVector, &expectedVector)) return false;
}
{
stable_vector<int> testedVector = {1, 2, 3};
testedVector.assign({5, 6, 7});
const std::vector<int> expectedVector = {5, 6, 7};
if(!test::CheckEqualContainers(&testedVector, &expectedVector)) return false;
}
{
stable_vector<int> testedVector = {1, 2, 3};
testedVector.insert(testedVector.cend(), {5, 6, 7});
const std::vector<int> expectedVector = {1, 2, 3, 5, 6, 7};
if(!test::CheckEqualContainers(&testedVector, &expectedVector)) return false;
}
return true;
#else
return true;
#endif
}
int main()
{
recursive_vector_test();
@@ -178,6 +216,12 @@ int main()
if(!boost::container::test::test_propagate_allocator<stable_vector>())
return 1;
if(!test_methods_with_initializer_list_as_argument())
{
std::cerr << "test_methods_with_initializer_list_as_argument failed" << std::endl;
return 1;
}
return 0;
}