svn commit: r477206 - head/devel/nlohmann-json/files
Jan Beich
jbeich at FreeBSD.org
Tue Aug 14 21:48:02 UTC 2018
Author: jbeich
Date: Tue Aug 14 21:48:01 2018
New Revision: 477206
URL: https://svnweb.freebsd.org/changeset/ports/477206
Log:
devel/nlohmann-json: unbreak consumers with libc++ 7
In file included from test/src/unit-conversions.cpp:32:
single_include/nlohmann/json.hpp:1201:9: error: static_assert failed "could not find from_json() method in T's namespace"
static_assert(sizeof(BasicJsonType) == 0,
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~
single_include/nlohmann/json.hpp:1216:16: note: in instantiation of function template specialization 'nlohmann::detail::from_json_fn::call<nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer>, std::__1::basic_string_view<char, std::__1::char_traits<char> > >' requested here
return call(j, val, priority_tag<1> {});
^
single_include/nlohmann/json.hpp:9660:9: note: in instantiation of function template specialization 'nlohmann::detail::from_json_fn::operator()<nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer>, std::__1::basic_string_view<char, std::__1::char_traits<char> > >' requested here
::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
^
single_include/nlohmann/json.hpp:12181:36: note: in instantiation of function template specialization 'nlohmann::adl_serializer<std::__1::basic_string_view<char, std::__1::char_traits<char> >, void>::from_json<const nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer> &, std::__1::basic_string_view<char, std::__1::char_traits<char> > >' requested here
JSONSerializer<ValueType>::from_json(*this, ret);
^
single_include/nlohmann/json.hpp:12443:16: note: in instantiation of function template specialization 'nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer>::get<std::__1::basic_string_view<char, std::__1::char_traits<char> >, std::__1::basic_string_view<char, std::__1::char_traits<char> >, 0>' requested here
return get<ValueType>();
^
/usr/include/c++/v1/string:875:29: note: in instantiation of function template specialization 'nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer>::operator basic_string_view<std::__1::basic_string_view<char, std::__1::char_traits<char> >, 0>' requested here
{__self_view __sv = __t; return assign(__sv);}
^
/usr/include/c++/v1/algorithm:1744:19: note: (skipping 3 contexts in backtrace; use -ftemplate-backtrace-limit=0 to see all)
*__result = *__first;
^
single_include/nlohmann/json.hpp:1195:16: note: in instantiation of function template specialization 'nlohmann::detail::from_json<nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer>, std::__1::basic_string<char>, 0>' requested here
return from_json(j, val);
^
single_include/nlohmann/json.hpp:1216:16: note: in instantiation of function template specialization 'nlohmann::detail::from_json_fn::call<nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer>, std::__1::valarray<std::__1::basic_string<char> > >' requested here
return call(j, val, priority_tag<1> {});
^
single_include/nlohmann/json.hpp:9660:9: note: in instantiation of function template specialization 'nlohmann::detail::from_json_fn::operator()<nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer>, std::__1::valarray<std::__1::basic_string<char> > >' requested here
::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
^
single_include/nlohmann/json.hpp:12181:36: note: in instantiation of function template specialization 'nlohmann::adl_serializer<std::__1::valarray<std::__1::basic_string<char> >, void>::from_json<const nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer> &, std::__1::valarray<std::__1::basic_string<char> > >' requested here
JSONSerializer<ValueType>::from_json(*this, ret);
^
test/src/unit-conversions.cpp:1042:20: note: in instantiation of function template specialization 'nlohmann::basic_json<std::map, std::vector, std::__1::basic_string<char>, bool, long, unsigned long, double, std::allocator, adl_serializer>::get<std::__1::valarray<std::__1::basic_string<char> >, std::__1::valarray<std::__1::basic_string<char> >, 0>' requested here
j5.get<std::valarray<std::string>>();
^
PR: 230355
Obtained from: upstream
Added:
head/devel/nlohmann-json/files/
head/devel/nlohmann-json/files/patch-libc++7 (contents, props changed)
Added: head/devel/nlohmann-json/files/patch-libc++7
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/nlohmann-json/files/patch-libc++7 Tue Aug 14 21:48:01 2018 (r477206)
@@ -0,0 +1,126 @@
+https://github.com/nlohmann/json/commit/8165707990e4
+
+--- include/nlohmann/detail/conversions/from_json.hpp.orig 2018-03-14 20:48:03 UTC
++++ include/nlohmann/detail/conversions/from_json.hpp
+@@ -70,6 +70,25 @@ void from_json(const BasicJsonType& j, typename BasicJ
+ s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+ }
+
++template <
++ typename BasicJsonType, typename CompatibleStringType,
++ enable_if_t <
++ is_compatible_string_type<BasicJsonType, CompatibleStringType>::value and
++ not std::is_same<typename BasicJsonType::string_t,
++ CompatibleStringType>::value and
++ std::is_constructible <
++ BasicJsonType, typename CompatibleStringType::value_type >::value,
++ int > = 0 >
++void from_json(const BasicJsonType& j, CompatibleStringType& s)
++{
++ if (JSON_UNLIKELY(not j.is_string()))
++ {
++ JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
++ }
++
++ s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
++}
++
+ template<typename BasicJsonType>
+ void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+ {
+--- include/nlohmann/detail/meta.hpp.orig 2018-03-14 20:48:03 UTC
++++ include/nlohmann/detail/meta.hpp
+@@ -120,6 +120,16 @@ struct is_compatible_object_type_impl<true, RealType,
+ std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
+ };
+
++template<bool B, class RealType, class CompatibleStringType>
++struct is_compatible_string_type_impl : std::false_type {};
++
++template<class RealType, class CompatibleStringType>
++struct is_compatible_string_type_impl<true, RealType, CompatibleStringType>
++{
++ static constexpr auto value =
++ std::is_same<typename RealType::value_type, typename CompatibleStringType::value_type>::value;
++};
++
+ template<class BasicJsonType, class CompatibleObjectType>
+ struct is_compatible_object_type
+ {
+@@ -128,6 +138,15 @@ struct is_compatible_object_type
+ has_mapped_type<CompatibleObjectType>,
+ has_key_type<CompatibleObjectType>>::value,
+ typename BasicJsonType::object_t, CompatibleObjectType >::value;
++};
++
++template<class BasicJsonType, class CompatibleStringType>
++struct is_compatible_string_type
++{
++ static auto constexpr value = is_compatible_string_type_impl <
++ conjunction<negation<std::is_same<void, CompatibleStringType>>,
++ has_value_type<CompatibleStringType>>::value,
++ typename BasicJsonType::string_t, CompatibleStringType >::value;
+ };
+
+ template<typename BasicJsonType, typename T>
+--- single_include/nlohmann/json.hpp.orig 2018-03-14 20:48:03 UTC
++++ single_include/nlohmann/json.hpp
+@@ -353,6 +353,16 @@ struct is_compatible_object_type_impl<true, RealType,
+ std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
+ };
+
++template<bool B, class RealType, class CompatibleStringType>
++struct is_compatible_string_type_impl : std::false_type {};
++
++template<class RealType, class CompatibleStringType>
++struct is_compatible_string_type_impl<true, RealType, CompatibleStringType>
++{
++ static constexpr auto value =
++ std::is_same<typename RealType::value_type, typename CompatibleStringType::value_type>::value;
++};
++
+ template<class BasicJsonType, class CompatibleObjectType>
+ struct is_compatible_object_type
+ {
+@@ -363,6 +373,15 @@ struct is_compatible_object_type
+ typename BasicJsonType::object_t, CompatibleObjectType >::value;
+ };
+
++template<class BasicJsonType, class CompatibleStringType>
++struct is_compatible_string_type
++{
++ static auto constexpr value = is_compatible_string_type_impl <
++ conjunction<negation<std::is_same<void, CompatibleStringType>>,
++ has_value_type<CompatibleStringType>>::value,
++ typename BasicJsonType::string_t, CompatibleStringType >::value;
++};
++
+ template<typename BasicJsonType, typename T>
+ struct is_basic_json_nested_type
+ {
+@@ -974,6 +993,25 @@ void from_json(const BasicJsonType& j, typename BasicJ
+ {
+ JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+ }
++ s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
++}
++
++template <
++ typename BasicJsonType, typename CompatibleStringType,
++ enable_if_t <
++ is_compatible_string_type<BasicJsonType, CompatibleStringType>::value and
++ not std::is_same<typename BasicJsonType::string_t,
++ CompatibleStringType>::value and
++ std::is_constructible <
++ BasicJsonType, typename CompatibleStringType::value_type >::value,
++ int > = 0 >
++void from_json(const BasicJsonType& j, CompatibleStringType& s)
++{
++ if (JSON_UNLIKELY(not j.is_string()))
++ {
++ JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
++ }
++
+ s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+ }
+
More information about the svn-ports-head
mailing list