mirror of
https://github.com/bolero-MURAKAMI/Sprout.git
synced 2025-07-16 15:14:13 +00:00
modify namespace result_of -> results
support C++14 type_traits
This commit is contained in:
parent
d386893a74
commit
bf0c7021cf
350 changed files with 2628 additions and 1912 deletions
|
@ -15,7 +15,7 @@
|
|||
#include <sprout/iterator/operation.hpp>
|
||||
#include <sprout/iterator/set_union_iterator.hpp>
|
||||
#include <sprout/functional/less.hpp>
|
||||
#include <sprout/algorithm/fixed/result_of.hpp>
|
||||
#include <sprout/algorithm/fixed/results.hpp>
|
||||
#include <sprout/pit/pit.hpp>
|
||||
#include <sprout/detail/container_complate.hpp>
|
||||
|
||||
|
@ -25,7 +25,7 @@ namespace sprout {
|
|||
template<typename InputIterator1, typename InputIterator2, typename Result, typename Compare, typename... Args>
|
||||
inline SPROUT_CONSTEXPR typename std::enable_if<
|
||||
sprout::container_traits<Result>::static_size == sizeof...(Args),
|
||||
typename sprout::fixed::result_of::algorithm<Result>::type
|
||||
typename sprout::fixed::results::algorithm<Result>::type
|
||||
>::type
|
||||
set_union_impl(
|
||||
InputIterator1, InputIterator1,
|
||||
|
@ -40,7 +40,7 @@ namespace sprout {
|
|||
template<typename InputIterator1, typename InputIterator2, typename Result, typename Compare, typename... Args>
|
||||
inline SPROUT_CONSTEXPR typename std::enable_if<
|
||||
sprout::container_traits<Result>::static_size != sizeof...(Args),
|
||||
typename sprout::fixed::result_of::algorithm<Result>::type
|
||||
typename sprout::fixed::results::algorithm<Result>::type
|
||||
>::type
|
||||
set_union_impl(
|
||||
InputIterator1 first1, InputIterator1 last1,
|
||||
|
@ -84,7 +84,7 @@ namespace sprout {
|
|||
template<typename InputIterator1, typename InputIterator2, typename Result, typename Compare>
|
||||
inline SPROUT_CONSTEXPR typename std::enable_if<
|
||||
sprout::is_fixed_container<Result>::value,
|
||||
typename sprout::fixed::result_of::algorithm<Result>::type
|
||||
typename sprout::fixed::results::algorithm<Result>::type
|
||||
>::type
|
||||
set_union(
|
||||
InputIterator1 first1, InputIterator1 last1,
|
||||
|
@ -103,7 +103,7 @@ namespace sprout {
|
|||
template<typename InputIterator1, typename InputIterator2, typename Result, typename Compare>
|
||||
inline SPROUT_CONSTEXPR typename std::enable_if<
|
||||
!sprout::is_fixed_container<Result>::value,
|
||||
typename sprout::fixed::result_of::algorithm<Result>::type
|
||||
typename sprout::fixed::results::algorithm<Result>::type
|
||||
>::type
|
||||
set_union(
|
||||
InputIterator1 first1, InputIterator1 last1,
|
||||
|
@ -122,7 +122,7 @@ namespace sprout {
|
|||
// set_union
|
||||
//
|
||||
template<typename InputIterator1, typename InputIterator2, typename Result, typename Compare>
|
||||
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
|
||||
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
|
||||
set_union(
|
||||
InputIterator1 first1, InputIterator1 last1,
|
||||
InputIterator2 first2, InputIterator2 last2,
|
||||
|
@ -132,7 +132,7 @@ namespace sprout {
|
|||
return sprout::fixed::detail::set_union(first1, last1, first2, last2, result, comp);
|
||||
}
|
||||
template<typename InputIterator1, typename InputIterator2, typename Result>
|
||||
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
|
||||
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
|
||||
set_union(
|
||||
InputIterator1 first1, InputIterator1 last1,
|
||||
InputIterator2 first2, InputIterator2 last2,
|
||||
|
@ -143,7 +143,7 @@ namespace sprout {
|
|||
}
|
||||
|
||||
template<typename Result, typename InputIterator1, typename InputIterator2, typename Compare>
|
||||
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
|
||||
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
|
||||
set_union(
|
||||
InputIterator1 first1, InputIterator1 last1,
|
||||
InputIterator2 first2, InputIterator2 last2,
|
||||
|
@ -153,7 +153,7 @@ namespace sprout {
|
|||
return sprout::fixed::set_union(first1, last1, first2, last2, sprout::pit<Result>(), comp);
|
||||
}
|
||||
template<typename Result, typename InputIterator1, typename InputIterator2>
|
||||
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
|
||||
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
|
||||
set_union(
|
||||
InputIterator1 first1, InputIterator1 last1,
|
||||
InputIterator2 first2, InputIterator2 last2
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue