j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🚨 fixed two warnings

Browse source
This commit is contained in:
Niels Lohmann 2018-12-20 22:41:48 +01:00
parent 117c1d14fb
commit 45f5611d9b
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/nlohmann/detail/iterators/iteration_proxy.hpp
View file

@ -148,13 +148,13 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
namespace std namespace std
{ {
template <typename IteratorType> template <typename IteratorType>
struct tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
: std::integral_constant<std::size_t, 2> {}; : public std::integral_constant<std::size_t, 2> {};
template <std::size_t N, typename IteratorType> template <std::size_t N, typename IteratorType>
struct tuple_element < class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
{ {
public:
using type = decltype( using type = decltype(
get<N>(std::declval < get<N>(std::declval <
::nlohmann::detail::iteration_proxy_value<IteratorType >> ())); ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));

8
single_include/nlohmann/json.hpp
View file

@ -1796,13 +1796,13 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
namespace std namespace std
{ {
template <typename IteratorType> template <typename IteratorType>
struct tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
: std::integral_constant<std::size_t, 2> {}; : public std::integral_constant<std::size_t, 2> {};
template <std::size_t N, typename IteratorType> template <std::size_t N, typename IteratorType>
struct tuple_element < class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
{ {
public:
using type = decltype( using type = decltype(
get<N>(std::declval < get<N>(std::declval <
::nlohmann::detail::iteration_proxy_value<IteratorType >> ())); ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));