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

Complete pull #94 with flat_set/map/set containers

Browse Source
This commit is contained in:
Ion Gaztañaga
2018-11-29 23:37:10 +01:00
parent 7f3d3ef8f9
commit 51669a5330
5 changed files with 187 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/container/flat_map.hpp
+16 -20
View File
@@ -49,10 +49,6 @@
#include <initializer_list>
#endif
#ifndef BOOST_CONTAINER_NO_CXX17_CTAD
#include <type_traits>
#endif
namespace boost {
namespace container {
@@ -1593,16 +1589,16 @@ template < typename InputIterator, typename AllocatorOrCompare>
flat_map(InputIterator, InputIterator, AllocatorOrCompare const&) ->
flat_map< it_based_non_const_first_type_t<InputIterator>
, it_based_second_type_t<InputIterator>
, std::conditional_t< // Compare
, typename dtl::if_c< // Compare
dtl::is_allocator<AllocatorOrCompare>::value
, std::less<it_based_non_const_first_type_t<InputIterator>>
, AllocatorOrCompare
>
, std::conditional_t< // Allocator
>::type
, typename dtl::if_c< // Allocator
dtl::is_allocator<AllocatorOrCompare>::value
, AllocatorOrCompare
, new_allocator<std::pair<it_based_non_const_first_type_t<InputIterator>, it_based_second_type_t<InputIterator>>>
>
>::type
>;
template < typename InputIterator, typename Compare, typename Allocator
@@ -1623,16 +1619,16 @@ template < typename InputIterator, typename AllocatorOrCompare>
flat_map(ordered_unique_range_t, InputIterator, InputIterator, AllocatorOrCompare const&) ->
flat_map< it_based_non_const_first_type_t<InputIterator>
, it_based_second_type_t<InputIterator>
, std::conditional_t< // Compare
, typename dtl::if_c< // Compare
dtl::is_allocator<AllocatorOrCompare>::value
, std::less<it_based_non_const_first_type_t<InputIterator>>
, AllocatorOrCompare
>
, std::conditional_t< // Allocator
>::type
, typename dtl::if_c< // Allocator
dtl::is_allocator<AllocatorOrCompare>::value
, AllocatorOrCompare
, new_allocator<std::pair<it_based_non_const_first_type_t<InputIterator>, it_based_second_type_t<InputIterator>>>
>
>::type
>;
template < typename InputIterator, typename Compare, typename Allocator
@@ -2901,16 +2897,16 @@ template < typename InputIterator, typename AllocatorOrCompare>
flat_multimap(InputIterator, InputIterator, AllocatorOrCompare const&) ->
flat_multimap< it_based_non_const_first_type_t<InputIterator>
, it_based_second_type_t<InputIterator>
, std::conditional_t< // Compare
, typename dtl::if_c< // Compare
dtl::is_allocator<AllocatorOrCompare>::value
, std::less<it_based_non_const_first_type_t<InputIterator>>
, AllocatorOrCompare
>
, std::conditional_t< // Allocator
>::type
, typename dtl::if_c< // Allocator
dtl::is_allocator<AllocatorOrCompare>::value
, AllocatorOrCompare
, new_allocator<std::pair<it_based_non_const_first_type_t<InputIterator>, it_based_second_type_t<InputIterator>>>
>
>::type
>;
template < typename InputIterator, typename Compare, typename Allocator
@@ -2931,16 +2927,16 @@ template < typename InputIterator, typename AllocatorOrCompare>
flat_multimap(ordered_range_t, InputIterator, InputIterator, AllocatorOrCompare const&) ->
flat_multimap< it_based_non_const_first_type_t<InputIterator>
, it_based_second_type_t<InputIterator>
, std::conditional_t< // Compare
, typename dtl::if_c< // Compare
dtl::is_allocator<AllocatorOrCompare>::value
, std::less<it_based_non_const_first_type_t<InputIterator>>
, AllocatorOrCompare
>
, std::conditional_t< // Allocator
>::type
, typename dtl::if_c< // Allocator
dtl::is_allocator<AllocatorOrCompare>::value
, AllocatorOrCompare
, new_allocator<std::pair<it_based_non_const_first_type_t<InputIterator>, it_based_second_type_t<InputIterator>>>
>
>::type
>;
template < typename InputIterator, typename Compare, typename Allocator