feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Fixes #118 ("Non-unique inplace_set_difference used in in flat_tree_merge_unique and iterator invalidation in insert_unique")

Browse Source
This commit is contained in:
Ion Gaztañaga
2019-04-24 22:49:50 +02:00
parent b075bce22e
commit 06ee4f7a39
6 changed files with 216 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/flat_map_adaptor_test.cpp
+104
View File
@@ -0,0 +1,104 @@
//////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Ion Gaztanaga 2004-2019. 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)
//
// See http://www.boost.org/libs/container for documentation.
//
//////////////////////////////////////////////////////////////////////////////
#include <boost/container/flat_map.hpp>
#include <boost/container/small_vector.hpp>
#include <boost/container/static_vector.hpp>
#include <boost/container/stable_vector.hpp>
#include <boost/container/vector.hpp>
#include <boost/container/deque.hpp>
#include <boost/container/detail/container_or_allocator_rebind.hpp>
#include "map_test.hpp"
#include <map>
using namespace boost::container;
template<class VoidAllocatorOrContainer>
struct GetMapContainer
{
template<class ValueType>
struct apply
{
typedef std::pair<ValueType, ValueType> type_t;
typedef flat_map< ValueType
, ValueType
, std::less<ValueType>
, typename boost::container::dtl::container_or_allocator_rebind<VoidAllocatorOrContainer, type_t>::type
> map_type;
typedef flat_multimap< ValueType
, ValueType
, std::less<ValueType>
, typename boost::container::dtl::container_or_allocator_rebind<VoidAllocatorOrContainer, type_t>::type
> multimap_type;
};
};
int main()
{
using namespace boost::container::test;
////////////////////////////////////
// Testing sequence container implementations
////////////////////////////////////
{
typedef std::map<int, int> MyStdMap;
typedef std::multimap<int, int> MyStdMultiMap;
if (0 != test::map_test
< GetMapContainer<vector<std::pair<int, int> > >::apply<int>::map_type
, MyStdMap
, GetMapContainer<vector<std::pair<int, int> > >::apply<int>::multimap_type
, MyStdMultiMap>()) {
std::cout << "Error in map_test<vector<std::pair<int, int> > >" << std::endl;
return 1;
}
if (0 != test::map_test
< GetMapContainer<small_vector<std::pair<int, int>, 7> >::apply<int>::map_type
, MyStdMap
, GetMapContainer<small_vector<std::pair<int, int>, 7> >::apply<int>::multimap_type
, MyStdMultiMap>()) {
std::cout << "Error in map_test<small_vector<std::pair<int, int>, 7> >" << std::endl;
return 1;
}
if (0 != test::map_test
< GetMapContainer<static_vector<std::pair<int, int>, MaxElem * 10> >::apply<int>::map_type
, MyStdMap
, GetMapContainer<static_vector<std::pair<int, int>, MaxElem * 10> >::apply<int>::multimap_type
, MyStdMultiMap>()) {
std::cout << "Error in map_test<static_vector<std::pair<int, int>, MaxElem * 10> >" << std::endl;
return 1;
}
if (0 != test::map_test
< GetMapContainer<stable_vector<std::pair<int, int> > >::apply<int>::map_type
, MyStdMap
, GetMapContainer<stable_vector<std::pair<int, int> > >::apply<int>::multimap_type
, MyStdMultiMap>()) {
std::cout << "Error in map_test<stable_vector<std::pair<int, int> > >" << std::endl;
return 1;
}
if (0 != test::map_test
< GetMapContainer<deque<std::pair<int, int> > >::apply<int>::map_type
, MyStdMap
, GetMapContainer<deque<std::pair<int, int> > >::apply<int>::multimap_type
, MyStdMultiMap>()) {
std::cout << "Error in map_test<deque<std::pair<int, int> > >" << std::endl;
return 1;
}
}
return 0;
}
test/flat_set_adaptor_test.cpp
+101
View File
@@ -0,0 +1,101 @@
//////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Ion Gaztanaga 2004-2019. 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)
//
// See http://www.boost.org/libs/container for documentation.
//
//////////////////////////////////////////////////////////////////////////////
#include <boost/container/flat_set.hpp>
#include <boost/container/small_vector.hpp>
#include <boost/container/static_vector.hpp>
#include <boost/container/stable_vector.hpp>
#include <boost/container/vector.hpp>
#include <boost/container/deque.hpp>
#include <boost/container/detail/container_or_allocator_rebind.hpp>
#include "set_test.hpp"
#include <set>
using namespace boost::container;
template<class VoidAllocatorOrContainer>
struct GetSetContainer
{
template<class ValueType>
struct apply
{
typedef flat_set < ValueType
, std::less<ValueType>
, typename boost::container::dtl::container_or_allocator_rebind<VoidAllocatorOrContainer, ValueType>::type
> set_type;
typedef flat_multiset < ValueType
, std::less<ValueType>
, typename boost::container::dtl::container_or_allocator_rebind<VoidAllocatorOrContainer, ValueType>::type
> multiset_type;
};
};
int main()
{
using namespace boost::container::test;
////////////////////////////////////
// Testing sequence container implementations
////////////////////////////////////
{
typedef std::set<int> MyStdSet;
typedef std::multiset<int> MyStdMultiSet;
if (0 != test::set_test
< GetSetContainer<vector<int> >::apply<int>::set_type
, MyStdSet
, GetSetContainer<vector<int> >::apply<int>::multiset_type
, MyStdMultiSet>()) {
std::cout << "Error in set_test<vector<int> >" << std::endl;
return 1;
}
if (0 != test::set_test
< GetSetContainer<small_vector<int, 7> >::apply<int>::set_type
, MyStdSet
, GetSetContainer<small_vector<int, 7> >::apply<int>::multiset_type
, MyStdMultiSet>()) {
std::cout << "Error in set_test<small_vector<int, 7> >" << std::endl;
return 1;
}
if (0 != test::set_test
< GetSetContainer<static_vector<int, MaxElem * 10> >::apply<int>::set_type
, MyStdSet
, GetSetContainer<static_vector<int, MaxElem * 10> >::apply<int>::multiset_type
, MyStdMultiSet>()) {
std::cout << "Error in set_test<static_vector<int, MaxElem * 10> >" << std::endl;
return 1;
}
if (0 != test::set_test
< GetSetContainer<stable_vector<int> >::apply<int>::set_type
, MyStdSet
, GetSetContainer<stable_vector<int> >::apply<int>::multiset_type
, MyStdMultiSet>()) {
std::cout << "Error in set_test<stable_vector<int> >" << std::endl;
return 1;
}
if (0 != test::set_test
< GetSetContainer<deque<int> >::apply<int>::set_type
, MyStdSet
, GetSetContainer<deque<int> >::apply<int>::multiset_type
, MyStdMultiSet>()) {
std::cout << "Error in set_test<deque<int> >" << std::endl;
return 1;
}
}
return 0;
}
test/map_test.hpp
+1
View File
@@ -14,6 +14,7 @@
#include <boost/container/detail/config_begin.hpp>
#include "check_equal_containers.hpp"
#include "print_container.hpp"
#include "movable_int.hpp"
#include <boost/container/detail/pair.hpp>
#include <boost/move/iterator.hpp>
#include <boost/move/utility_core.hpp>
test/set_test.hpp
+1
View File
@@ -14,6 +14,7 @@
#include <boost/container/detail/config_begin.hpp>
#include "check_equal_containers.hpp"
#include "print_container.hpp"
#include "movable_int.hpp"
#include <boost/move/utility_core.hpp>
#include <boost/move/iterator.hpp>
#include <boost/move/make_unique.hpp>