range-v3: update to 0.9.1.
This commit is contained in:
parent
728bebcec5
commit
3e2da7cc8b
2 changed files with 3 additions and 99 deletions
|
@ -1,96 +0,0 @@
|
||||||
diff --git include/meta/meta_fwd.hpp include/meta/meta_fwd.hpp
|
|
||||||
index edfb9068..ac041999 100644
|
|
||||||
--- include/meta/meta_fwd.hpp
|
|
||||||
+++ include/meta/meta_fwd.hpp
|
|
||||||
@@ -152,6 +152,13 @@
|
|
||||||
#define META_TYPE_CONSTRAINT(...) typename
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if (defined(__cpp_lib_type_trait_variable_templates) && \
|
|
||||||
+ __cpp_lib_type_trait_variable_templates > 0)
|
|
||||||
+#define META_CXX_TRAIT_VARIABLE_TEMPLATES 1
|
|
||||||
+#else
|
|
||||||
+#define META_CXX_TRAIT_VARIABLE_TEMPLATES 0
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
namespace meta
|
|
||||||
{
|
|
||||||
#if META_CXX_INTEGER_SEQUENCE
|
|
||||||
@@ -208,8 +215,10 @@ namespace meta
|
|
||||||
META_CONCEPT_BARRIER(__is_same(T, U));
|
|
||||||
#elif defined(__GNUC__) && __GNUC__ >= 6
|
|
||||||
META_CONCEPT_BARRIER(__is_same_as(T, U));
|
|
||||||
-#else
|
|
||||||
+#elif defined(META_CXX_TRAIT_VARIABLE_TEMPLATES)
|
|
||||||
META_CONCEPT_BARRIER(std::is_same_v<T, U>);
|
|
||||||
+#else
|
|
||||||
+ META_CONCEPT_BARRIER(std::is_same<T, U>::value);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <template <typename...> class C, typename... Ts>
|
|
||||||
@@ -248,7 +257,11 @@ namespace meta
|
|
||||||
typename T::type::value_type;
|
|
||||||
}
|
|
||||||
&& Same<typename T::value_type, typename T::type::value_type>
|
|
||||||
+#if META_CXX_TRAIT_VARIABLE_TEMPLATES
|
|
||||||
&& std::is_integral_v<typename T::value_type>
|
|
||||||
+#else
|
|
||||||
+ && std::is_integral<typename T::value_type>::value
|
|
||||||
+#endif
|
|
||||||
&& requires
|
|
||||||
{
|
|
||||||
// { T::value } -> Same<const typename T::value_type&>;
|
|
||||||
diff --git include/range/v3/range_fwd.hpp include/range/v3/range_fwd.hpp
|
|
||||||
index 0378a0bd..2fabf26c 100644
|
|
||||||
--- include/range/v3/range_fwd.hpp
|
|
||||||
+++ include/range/v3/range_fwd.hpp
|
|
||||||
@@ -247,6 +247,16 @@ namespace ranges
|
|
||||||
struct priority_tag<0>
|
|
||||||
{};
|
|
||||||
|
|
||||||
+ template<typename T>
|
|
||||||
+ using is_trivial = meta::bool_<
|
|
||||||
+#if META_CXX_TRAIT_VARIABLE_TEMPLATES
|
|
||||||
+ std::is_trivially_copyable_v<T> &&
|
|
||||||
+ std::is_trivially_default_constructible_v<T>>;
|
|
||||||
+#else
|
|
||||||
+ std::is_trivially_copyable<T>::value &&
|
|
||||||
+ std::is_trivially_default_constructible<T>::value>;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if defined(__clang__) && !defined(_LIBCPP_VERSION)
|
|
||||||
template<typename T, typename... Args>
|
|
||||||
using is_trivially_constructible =
|
|
||||||
@@ -272,19 +282,6 @@ namespace ranges
|
|
||||||
template<typename T>
|
|
||||||
using is_trivially_copyable =
|
|
||||||
meta::bool_<__is_trivially_copyable(T)>;
|
|
||||||
- #elif defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5
|
|
||||||
- template<typename T>
|
|
||||||
- using is_trivially_default_constructible = std::is_trivial<T>;
|
|
||||||
- template<typename T>
|
|
||||||
- using is_trivially_copy_constructible = std::is_trivial<T>;
|
|
||||||
- template<typename T>
|
|
||||||
- using is_trivially_move_constructible = std::is_trivial<T>;
|
|
||||||
- template<typename T>
|
|
||||||
- using is_trivially_copy_assignable = std::is_trivial<T>;
|
|
||||||
- template<typename T>
|
|
||||||
- using is_trivially_move_assignable = std::is_trivial<T>;
|
|
||||||
- template<typename T>
|
|
||||||
- using is_trivially_copyable = std::is_trivial<T>;
|
|
||||||
#else
|
|
||||||
template<typename T>
|
|
||||||
using is_trivially_default_constructible =
|
|
||||||
diff --git include/range/v3/utility/box.hpp include/range/v3/utility/box.hpp
|
|
||||||
index 5e8b90dd..33d674df 100644
|
|
||||||
--- include/range/v3/utility/box.hpp
|
|
||||||
+++ include/range/v3/utility/box.hpp
|
|
||||||
@@ -128,7 +128,7 @@ namespace ranges
|
|
||||||
// MSVC pukes passing non-constant-expression objects to constexpr
|
|
||||||
// functions, so do not coalesce.
|
|
||||||
template<typename T, typename = meta::if_<
|
|
||||||
- meta::strict_and<std::is_empty<T>, std::is_trivial<T>>>>
|
|
||||||
+ meta::strict_and<std::is_empty<T>, detail::is_trivial<T>>>>
|
|
||||||
constexpr box_compress box_compression_(int)
|
|
||||||
{
|
|
||||||
return box_compress::coalesce;
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'range-v3'
|
# Template file for 'range-v3'
|
||||||
pkgname=range-v3
|
pkgname=range-v3
|
||||||
version=0.5.0
|
version=0.9.1
|
||||||
revision=2
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DRANGE_V3_EXAMPLES=OFF -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
|
configure_args="-DRANGE_V3_EXAMPLES=OFF -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
|
||||||
-DRANGES_NATIVE=OFF"
|
-DRANGES_NATIVE=OFF"
|
||||||
|
@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
|
||||||
license="BSL-1.0"
|
license="BSL-1.0"
|
||||||
homepage="https://github.com/ericniebler/range-v3"
|
homepage="https://github.com/ericniebler/range-v3"
|
||||||
distfiles="https://github.com/ericniebler/range-v3/archive/${version}.tar.gz"
|
distfiles="https://github.com/ericniebler/range-v3/archive/${version}.tar.gz"
|
||||||
checksum=32e30b3be042246030f31d40394115b751431d9d2b4e0f6d58834b2fd5594280
|
checksum=2b5b442d572b5978ea51c650adfaf0796f39f326404d09b83d846e04f571876b
|
||||||
|
|
||||||
if [ "$XBPS_CHECK_PKGS" ]; then
|
if [ "$XBPS_CHECK_PKGS" ]; then
|
||||||
configure_args+=" -DRANGE_V3_HEADER_CHECKS=ON -DRANGE_V3_TESTS=ON
|
configure_args+=" -DRANGE_V3_HEADER_CHECKS=ON -DRANGE_V3_TESTS=ON
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue