mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-16 15:14:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

modify namespace result_of -> results

Browse source 
support C++14 type_traits
This commit is contained in:
bolero-MURAKAMI 2013-11-20 22:04:11 +09:00
parent d386893a74
commit bf0c7021cf
350 changed files with 2628 additions and 1912 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sprout/algorithm/fixed/inplace_merge.hpp
View file

@ -11,7 +11,7 @@
#include <sprout/config.hpp>
#include <sprout/container/traits.hpp>
#include <sprout/container/functions.hpp>
#include <sprout/algorithm/fixed/result_of.hpp>
#include <sprout/algorithm/fixed/results.hpp>
#include <sprout/algorithm/fixed/merge.hpp>
namespace sprout {
@ -20,7 +20,7 @@ namespace sprout {
// inplace_merge
//
template<typename Container, typename Compare>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Container>::type
inplace_merge(Container const& cont, typename sprout::container_traits<Container>::const_iterator middle, Compare comp) {
return sprout::fixed::merge(
sprout::begin(cont), middle,
@ -32,7 +32,7 @@ namespace sprout {
// inplace_merge
//
template<typename Container>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Container>::type
inplace_merge(Container const& cont, typename sprout::container_traits<Container>::const_iterator middle) {
return sprout::fixed::merge(
sprout::begin(cont), middle,