haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move static_const to the detail namespace

pull/423/head
Théo DELRIEU 2017-01-15 21:18:58 +01:00
parent 794dae8911
commit e60e458a7e
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/json.hpp
View File

@ -797,6 +797,16 @@ public:
}
};
// taken from ranges-v3
template <typename T>
struct static_const
{
static constexpr T value{};
};
template <typename T>
constexpr T static_const<T>::value;
/*!
@brief helper class to create locales with decimal point
@ -818,21 +828,10 @@ struct DecimalSeparator : std::numpunct<char>
};
}
// taken from ranges-v3
// TODO add doc
template <typename T>
struct static_const
{
static constexpr T value{};
};
template <typename T>
constexpr T static_const<T>::value;
inline namespace
{
constexpr const auto & to_json = static_const<detail::to_json_fn>::value;
constexpr const auto & from_json = static_const<detail::from_json_fn>::value;
constexpr const auto & to_json = detail::static_const<detail::to_json_fn>::value;
constexpr const auto & from_json = detail::static_const<detail::from_json_fn>::value;
}
// default JSONSerializer template argument, doesn't care about template argument

25
src/json.hpp.re2c
View File

@ -797,6 +797,16 @@ public:
}
};
// taken from ranges-v3
template <typename T>
struct static_const
{
static constexpr T value{};
};
template <typename T>
constexpr T static_const<T>::value;
/*!
@brief helper class to create locales with decimal point
@ -818,21 +828,10 @@ struct DecimalSeparator : std::numpunct<char>
};
}
// taken from ranges-v3
// TODO add doc
template <typename T>
struct static_const
{
static constexpr T value{};
};
template <typename T>
constexpr T static_const<T>::value;
inline namespace
{
constexpr const auto & to_json = static_const<detail::to_json_fn>::value;
constexpr const auto & from_json = static_const<detail::from_json_fn>::value;
constexpr const auto & to_json = detail::static_const<detail::to_json_fn>::value;
constexpr const auto & from_json = detail::static_const<detail::from_json_fn>::value;
}
// default JSONSerializer template argument, doesn't care about template argument