add C++14 constexpr merge algorithm

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

View file

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