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

Merge branch 'matekm-vector_support_for_std_initializer_list' into develop

Browse Source
This commit is contained in:
Ion Gaztañaga
2014-08-17 10:54:35 +02:00
parent dd01853881 ac4dde2c6e
commit 791d53278a
4 changed files with 107 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
include/boost/container/vector.hpp
View File

@@ -50,6 +50,10 @@
#include <boost/container/detail/advanced_insert_int.hpp>
#include <boost/assert.hpp>
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
#include <initializer_list>
#endif
namespace boost {
namespace container {
@@ -710,6 +714,22 @@ class vector
, x.size(), container_detail::to_raw_pointer(this->m_holder.start()));
}
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
//! <b>Effects</b>: Constructs a vector that will use a copy of allocator a
//! and inserts a copy of the range [il.begin(), il.last()) in the 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()).
vector(std::initializer_list<value_type> il, const allocator_type& a = allocator_type())
: m_holder(a)
{
insert(cend(), il.begin(), il.end());
}
#endif
//! <b>Effects</b>: Move constructor. Moves x's resources to *this.
//!
//! <b>Throws</b>: Nothing
@@ -805,6 +825,17 @@ class 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()).
vector& operator=(std::initializer_list<value_type> il)
{
assign(il.begin(), il.end());
return *this;
}
#endif
//! <b>Effects</b>: Move assignment. All x's values are transferred to *this.
//!
//! <b>Postcondition</b>: x.empty(). *this contains a the elements x had
@@ -905,6 +936,18 @@ class 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 iniializer_list iterator throws.
//!
void assign(std::initializer_list<T> il)
{
assign(il.begin(), il.end());
}
#endif
//! <b>Effects</b>: Assigns the the range [first, last) to *this.
//!
//! <b>Throws</b>: If memory allocation throws or T's copy/move constructor/assignment or
@@ -1532,6 +1575,20 @@ class vector
}
#endif
#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 the range [il.begin(), il.end()).
iterator insert(const_iterator position, std::initializer_list<value_type> il)
{
return insert(position, il.begin(), il.end());
}
#endif
//! <b>Effects</b>: Removes the last element from the vector.
//!
//! <b>Throws</b>: Nothing.

42
test/stable_vector_test.cpp
View File

@@ -112,44 +112,6 @@ 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();
@@ -219,7 +181,9 @@ int main()
////////////////////////////////////
// Initializer lists testing
////////////////////////////////////
if(!test_methods_with_initializer_list_as_argument())
if(!boost::container::test::test_vector_methods_with_initializer_list_as_argument_for<
boost::container::stable_vector<int>
>())
{
std::cerr << "test_methods_with_initializer_list_as_argument failed" << std::endl;
return 1;

8
test/vector_test.cpp
View File

@@ -251,6 +251,14 @@ int main()
return 1;
}
////////////////////////////////////
// Initializer lists testing
////////////////////////////////////
if(!boost::container::test::test_vector_methods_with_initializer_list_as_argument_for<
boost::container::vector<int>
>()) {
return 1;
}
return 0;
}

39
test/vector_test.hpp
View File

@@ -328,6 +328,45 @@ int vector_test()
return 0;
}
template<typename VectorContainerType>
bool test_vector_methods_with_initializer_list_as_argument_for()
{
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
{
const VectorContainerType testedVector = {1, 2, 3};
const std::vector<int> expectedVector = {1, 2, 3};
if(!test::CheckEqualContainers(&testedVector, &expectedVector)) return false;
}
{
VectorContainerType testedVector = {1, 2, 3};
testedVector = {11, 12, 13};
const std::vector<int> expectedVector = {11, 12, 13};
if(!test::CheckEqualContainers(&testedVector, &expectedVector)) return false;
}
{
VectorContainerType testedVector = {1, 2, 3};
testedVector.assign({5, 6, 7});
const std::vector<int> expectedVector = {5, 6, 7};
if(!test::CheckEqualContainers(&testedVector, &expectedVector)) return false;
}
{
VectorContainerType 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
}
} //namespace test{
} //namespace container {
} //namespace boost{