From 45f5611d9bda27cd4732ac3c374ee9c62ee6d5e4 Mon Sep 17 00:00:00 2001 From: Niels Lohmann <mail@nlohmann.me> Date: Thu, 20 Dec 2018 22:41:48 +0100 Subject: [PATCH] :rotating_light: fixed two warnings --- include/nlohmann/detail/iterators/iteration_proxy.hpp | 8 ++++---- single_include/nlohmann/json.hpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/nlohmann/detail/iterators/iteration_proxy.hpp b/include/nlohmann/detail/iterators/iteration_proxy.hpp index 837ce9c8..51e77046 100644 --- a/include/nlohmann/detail/iterators/iteration_proxy.hpp +++ b/include/nlohmann/detail/iterators/iteration_proxy.hpp @@ -148,13 +148,13 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl namespace std { template <typename IteratorType> -struct tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> - : std::integral_constant<std::size_t, 2> {}; +class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> + : public std::integral_constant<std::size_t, 2> {}; template <std::size_t N, typename IteratorType> -struct tuple_element < - N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> +class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> { + public: using type = decltype( get<N>(std::declval < ::nlohmann::detail::iteration_proxy_value<IteratorType >> ())); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index dbcec732..5341affd 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -1796,13 +1796,13 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl namespace std { template <typename IteratorType> -struct tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> - : std::integral_constant<std::size_t, 2> {}; +class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> + : public std::integral_constant<std::size_t, 2> {}; template <std::size_t N, typename IteratorType> -struct tuple_element < - N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> +class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> { + public: using type = decltype( get<N>(std::declval < ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));