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

fix coding-style

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-10-06 13:53:07 +09:00
parent df3023db30
commit 5ce2cb023c
196 changed files with 1180 additions and 1787 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sprout/range/algorithm/fixed/merge.hpp
View file

@ -14,26 +14,13 @@ namespace sprout {
// merge
//
template<typename Input1, typename Input2, typename Result, typename Compare>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type merge(
Input1 const& input1,
Input2 const& input2,
Result const& result,
Compare comp
)
{
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
merge(Input1 const& input1, Input2 const& input2, Result const& result, Compare comp) {
return sprout::fixed::merge(sprout::begin(input1), sprout::end(input1), sprout::begin(input2), sprout::end(input2), result, comp);
}
//
// merge
//
template<typename Input1, typename Input2, typename Result>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type merge(
Input1 const& input1,
Input2 const& input2,
Result const& result
)
{
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
merge(Input1 const& input1, Input2 const& input2, Result const& result) {
return sprout::fixed::merge(sprout::begin(input1), sprout::end(input1), sprout::begin(input2), sprout::end(input2), result);
}
} // namespace fixed