mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-11-14 10:39:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add C++14 constexpr merge algorithm

Browse source
This commit is contained in:
bolero-MURAKAMI 2014-04-06 13:16:08 +09:00
parent a090307cc2
commit ecccb58042
4 changed files with 84 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sprout/algorithm/cxx14.hpp
View file

@ -46,8 +46,8 @@
#include <sprout/algorithm/cxx14/partial_sort.hpp> #include <sprout/algorithm/cxx14/partial_sort.hpp>
#include <sprout/algorithm/cxx14/partial_sort_copy.hpp> #include <sprout/algorithm/cxx14/partial_sort_copy.hpp>
#include <sprout/algorithm/cxx14/nth_element.hpp> #include <sprout/algorithm/cxx14/nth_element.hpp>
//#include <sprout/algorithm/cxx14/merge.hpp> #include <sprout/algorithm/cxx14/merge.hpp>
//#include <sprout/algorithm/cxx14/inplace_merge.hpp> #include <sprout/algorithm/cxx14/inplace_merge.hpp>
//#include <sprout/algorithm/cxx14/set_union.hpp> //#include <sprout/algorithm/cxx14/set_union.hpp>
//#include <sprout/algorithm/cxx14/set_intersection.hpp> //#include <sprout/algorithm/cxx14/set_intersection.hpp>
//#include <sprout/algorithm/cxx14/set_difference.hpp> //#include <sprout/algorithm/cxx14/set_difference.hpp>

27
sprout/algorithm/cxx14/inplace_merge.hpp Normal file
View file

@ -0,0 +1,27 @@
/*=============================================================================
Copyright (c) 2011-2014 Bolero MURAKAMI
https://github.com/bolero-MURAKAMI/Sprout
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)
=============================================================================*/
#ifndef SPROUT_ALGORITHM_CXX14_INPLACE_MERGE_HPP
#define SPROUT_ALGORITHM_CXX14_INPLACE_MERGE_HPP
#include <sprout/config.hpp>
namespace sprout {
//
// 25.4.4 Merge
//
// !!! TODO: implementation
template<typename BidirectionalIterator>
inline SPROUT_CXX14_CONSTEXPR void
inplace_merge(BidirectionalIterator first, BidirectionalIterator middle, BidirectionalIterator last);
template<typename BidirectionalIterator, typename Compare>
inline SPROUT_CXX14_CONSTEXPR void
inplace_merge(BidirectionalIterator first, BidirectionalIterator middle, BidirectionalIterator last, Compare comp);
} // namespace sprout
#endif // #ifndef SPROUT_ALGORITHM_CXX14_INPLACE_MERGE_HPP

54
sprout/algorithm/cxx14/merge.hpp Normal file
View file

@ -0,0 +1,54 @@
/*=============================================================================
Copyright (c) 2011-2014 Bolero MURAKAMI
https://github.com/bolero-MURAKAMI/Sprout
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)
=============================================================================*/
#ifndef SPROUT_ALGORITHM_CXX14_MERGE_HPP
#define SPROUT_ALGORITHM_CXX14_MERGE_HPP
#include <sprout/config.hpp>
#include <sprout/iterator/type_traits/is_iterator_of.hpp>
#include <sprout/type_traits/enabler_if.hpp>
#include <sprout/algorithm/cxx14/copy.hpp>
#include <sprout/functional/less.hpp>
namespace sprout {
//
// 25.4.4 Merge
//
template<
typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Compare,
typename sprout::enabler_if<sprout::is_iterator_outputable<OutputIterator>::value>::type = sprout::enabler
>
inline SPROUT_CXX14_CONSTEXPR OutputIterator
merge(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp) {
while (true) {
if (first1 == last1) {
return std::copy(first2, last2, result);
}
if (first2 == last2) {
return std::copy(first1, last1, result);
}
*result++ = comp(*first2, *first1)
? *first2++
: *first1++
;
}
}
template<
typename InputIterator1, typename InputIterator2, typename OutputIterator,
typename sprout::enabler_if<sprout::is_iterator_outputable<OutputIterator>::value>::type = sprout::enabler
>
inline SPROUT_CXX14_CONSTEXPR OutputIterator
merge(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, OutputIterator result) {
return sprout::merge(
first1, last1, first2, last2, result,
sprout::less<>()
);
}
} // namespace sprout
#endif // #ifndef SPROUT_ALGORITHM_CXX14_MERGE_HPP

2
sprout/tuple/tuple/type_traits.hpp
View file

@ -40,7 +40,7 @@ namespace sprout {
#if SPROUT_USE_VARIABLE_TEMPLATES #if SPROUT_USE_VARIABLE_TEMPLATES
namespace tuples { namespace tuples {
template<typename T> template<typename T>
SPROUT_STATIC_CONSTEXPR bool is_tuple_v = sprout::tuples::is_tuple_v<T>::value; SPROUT_STATIC_CONSTEXPR bool is_tuple_v = sprout::tuples::is_tuple<T>::value;
} // namespace tuples } // namespace tuples
using sprout::tuples::is_tuple; using sprout::tuples::is_tuple;