haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

removed is_compatible_float_type trait

Browse source
This commit is contained in:
Théo DELRIEU 2017-01-08 18:59:51 +01:00
parent be6b417c87
commit b2543e06d8
2 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/json.hpp
View file

@ -461,14 +461,6 @@ struct is_compatible_integer_type
RealIntegerType, CompatibleNumberIntegerType > ::value;
};
template <typename RealFloat, typename CompatibleFloat>
struct is_compatible_float_type
{
static constexpr auto value =
std::is_constructible<RealFloat, CompatibleFloat>::value and
std::is_floating_point<CompatibleFloat>::value;
};
template <typename BasicJson, typename T>
struct is_basic_json_nested_type
{
@ -568,12 +560,9 @@ void to_json(Json &j, const CompatibleString &s)
external_constructor<value_t::string>::construct(j, s);
}
template <
typename Json, typename CompatibleNumberFloatType,
enable_if_t<is_compatible_float_type<typename Json::number_float_t,
CompatibleNumberFloatType>::value,
int> = 0>
void to_json(Json &j, CompatibleNumberFloatType val) noexcept
template <typename Json, typename FloatType,
enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
void to_json(Json &j, FloatType val) noexcept
{
external_constructor<value_t::number_float>::construct(j, val);
}

17
src/json.hpp.re2c
View file

@ -461,14 +461,6 @@ struct is_compatible_integer_type
RealIntegerType, CompatibleNumberIntegerType > ::value;
};
template <typename RealFloat, typename CompatibleFloat>
struct is_compatible_float_type
{
static constexpr auto value =
std::is_constructible<RealFloat, CompatibleFloat>::value and
std::is_floating_point<CompatibleFloat>::value;
};
template <typename BasicJson, typename T>
struct is_basic_json_nested_type
{
@ -568,12 +560,9 @@ void to_json(Json &j, const CompatibleString &s)
external_constructor<value_t::string>::construct(j, s);
}
template <
typename Json, typename CompatibleNumberFloatType,
enable_if_t<is_compatible_float_type<typename Json::number_float_t,
CompatibleNumberFloatType>::value,
int> = 0>
void to_json(Json &j, CompatibleNumberFloatType val) noexcept
template <typename Json, typename FloatType,
enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
void to_json(Json &j, FloatType val) noexcept
{
external_constructor<value_t::number_float>::construct(j, val);
}