add min, max: initialize_list version

This commit is contained in:
bolero-MURAKAMI 2013-08-23 22:38:40 +09:00
parent 2dc912522b
commit 5ea46e507f
13 changed files with 81 additions and 1 deletions

View file

@ -9,7 +9,10 @@
#ifndef SPROUT_ALGORITHM_MAX_HPP
#define SPROUT_ALGORITHM_MAX_HPP
#include <initializer_list>
#include <sprout/config.hpp>
#include <sprout/algorithm/max_element.hpp>
#include <sprout/iterator/ptr_index_iterator.hpp>
#include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
namespace sprout {
@ -26,6 +29,32 @@ namespace sprout {
max(T const& a, T const& b) {
return sprout::max(a, b, NS_SSCRISK_CEL_OR_SPROUT::less<T>());
}
#ifdef SPROUT_NO_CXX14_INITIALIZER_LIST
template<typename T, typename Compare>
inline SPROUT_CONSTEXPR T
max(std::initializer_list<T> t, Compare comp) {
return *sprout::max_element(sprout::ptr_index(t.begin(), 0), sprout::ptr_index(t.begin(), t.size()), comp);
}
template<typename T>
inline SPROUT_CONSTEXPR T
max(std::initializer_list<T> t) {
return sprout::max(t, NS_SSCRISK_CEL_OR_SPROUT::less<T>());
}
#else // #ifdef SPROUT_NO_CXX14_INITIALIZER_LIST
template<typename T, typename Compare>
inline T
max(std::initializer_list<T> t, Compare comp) {
return *sprout::max_element(sprout::ptr_index(t.begin(), 0), sprout::ptr_index(t.begin(), t.size()), comp);
}
template<typename T>
inline T
max(std::initializer_list<T> t) {
return sprout::max(t, NS_SSCRISK_CEL_OR_SPROUT::less<T>());
}
#endif // #ifdef SPROUT_NO_CXX14_INITIALIZER_LIST
} // namespace sprout
#endif // #ifndef SPROUT_ALGORITHM_MAX_HPP

View file

@ -9,7 +9,10 @@
#ifndef SPROUT_ALGORITHM_MIN_HPP
#define SPROUT_ALGORITHM_MIN_HPP
#include <initializer_list>
#include <sprout/config.hpp>
#include <sprout/algorithm/min_element.hpp>
#include <sprout/iterator/ptr_index_iterator.hpp>
#include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
namespace sprout {
@ -26,6 +29,32 @@ namespace sprout {
min(T const& a, T const& b) {
return sprout::min(a, b, NS_SSCRISK_CEL_OR_SPROUT::less<T>());
}
#ifdef SPROUT_NO_CXX14_INITIALIZER_LIST
template<typename T, typename Compare>
inline SPROUT_CONSTEXPR T
min(std::initializer_list<T> t, Compare comp) {
return *sprout::min_element(sprout::ptr_index(t.begin(), 0), sprout::ptr_index(t.begin(), t.size()), comp);
}
template<typename T>
inline SPROUT_CONSTEXPR T
min(std::initializer_list<T> t) {
return sprout::min(t, NS_SSCRISK_CEL_OR_SPROUT::less<T>());
}
#else // #ifdef SPROUT_NO_CXX14_INITIALIZER_LIST
template<typename T, typename Compare>
inline T
min(std::initializer_list<T> t, Compare comp) {
return *sprout::min_element(sprout::ptr_index(t.begin(), 0), sprout::ptr_index(t.begin(), t.size()), comp);
}
template<typename T>
inline T
min(std::initializer_list<T> t) {
return sprout::min(t, NS_SSCRISK_CEL_OR_SPROUT::less<T>());
}
#endif // #ifdef SPROUT_NO_CXX14_INITIALIZER_LIST
} // namespace sprout
#endif // #ifndef SPROUT_ALGORITHM_MIN_HPP

View file

@ -43,8 +43,8 @@
#include <sprout/algorithm/equal_range.hpp>
#include <sprout/algorithm/binary_search.hpp>
#include <sprout/algorithm/includes.hpp>
#include <sprout/algorithm/is_heap_until.hpp>
#include <sprout/algorithm/is_heap.hpp>
#include <sprout/algorithm/is_heap_until.hpp>
#include <sprout/algorithm/min.hpp>
#include <sprout/algorithm/max.hpp>
#include <sprout/algorithm/minmax.hpp>

View file

@ -44,4 +44,6 @@
#define SPROUT_NO_CXX11_HDR_INITIALIZER_LIST
#define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif // #ifndef SPROUT_CONFIG_STDLIB_DINKUMWARE_HPP

View file

@ -33,4 +33,6 @@
#define SPROUT_NO_CXX11_SMART_PTR
#define SPROUT_NO_CXX11_HDR_FUNCTIONAL
#define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif // #ifndef SPROUT_CONFIG_STDLIB_LIBCOMO_HPP

View file

@ -23,4 +23,6 @@
# define SPROUT_NO_CXX11_NUMERIC_LIMITS
#endif
#define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif // #ifndef SPROUT_CONFIG_STDLIB_LIBCPP_HPP

View file

@ -63,4 +63,8 @@
#define SPROUT_NO_CXX11_HDR_CODECVT
#define SPROUT_NO_CXX11_ATOMIC_SMART_PTR
#if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) || !defined(__GXX_EXPERIMENTAL_CXX0X__))
# define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif
#endif // #ifndef SPROUT_CONFIG_STDLIB_LIBSTDCPP3_HPP

View file

@ -33,4 +33,6 @@
#define SPROUT_NO_CXX11_SMART_PTR
#define SPROUT_NO_CXX11_HDR_FUNCTIONAL
#define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif // #ifndef SPROUT_CONFIG_STDLIB_MODENA_HPP

View file

@ -33,4 +33,6 @@
#define SPROUT_NO_CXX11_SMART_PTR
#define SPROUT_NO_CXX11_HDR_FUNCTIONAL
#define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif // #ifndef SPROUT_CONFIG_STDLIB_MSL_HPP

View file

@ -36,4 +36,6 @@
#define SPROUT_NO_CXX11_SMART_PTR
#define SPROUT_NO_CXX11_HDR_FUNCTIONAL
#define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif // #ifndef SPROUT_CONFIG_STDLIB_ROGUEWAVE_HPP

View file

@ -33,4 +33,6 @@
#define SPROUT_NO_CXX11_SMART_PTR
#define SPROUT_NO_CXX11_HDR_FUNCTIONAL
#define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif // #ifndef SPROUT_CONFIG_STDLIB_SGI_HPP

View file

@ -33,4 +33,6 @@
#define SPROUT_NO_CXX11_SMART_PTR
#define SPROUT_NO_CXX11_HDR_FUNCTIONAL
#define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif // #ifndef SPROUT_CONFIG_STDLIB_STLPORT_HPP

View file

@ -33,4 +33,6 @@
#define SPROUT_NO_CXX11_SMART_PTR
#define SPROUT_NO_CXX11_HDR_FUNCTIONAL
#define SPROUT_NO_CXX14_INITIALIZER_LIST
#endif // #ifndef SPROUT_CONFIG_STDLIB_VACPP_HPP