From 47d759f732c4d17b4d2b9949e3bda595b15d8f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Metrich?= Date: Tue, 19 Mar 2024 22:26:24 +0100 Subject: [PATCH] Update type_traits.hpp --- Mk2_3phase_RFdatalog_temp/type_traits.hpp | 2 +- Mk2_3phase_RFdatalog_temp/type_traits/is_convertible.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mk2_3phase_RFdatalog_temp/type_traits.hpp b/Mk2_3phase_RFdatalog_temp/type_traits.hpp index ccacb696..eb78cf69 100644 --- a/Mk2_3phase_RFdatalog_temp/type_traits.hpp +++ b/Mk2_3phase_RFdatalog_temp/type_traits.hpp @@ -10,7 +10,7 @@ */ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2023, Benoit BLANCHON +// Copyright © 2014-2024, Benoit BLANCHON // MIT License #pragma once diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_convertible.hpp b/Mk2_3phase_RFdatalog_temp/type_traits/is_convertible.hpp index d50754b0..843039cc 100644 --- a/Mk2_3phase_RFdatalog_temp/type_traits/is_convertible.hpp +++ b/Mk2_3phase_RFdatalog_temp/type_traits/is_convertible.hpp @@ -25,10 +25,10 @@ struct is_convertible static int probe(To); static char probe(...); - static From& _from; + static From& from_; -public: - static const bool value = sizeof(probe(_from)) == sizeof(int); + public: + static const bool value = sizeof(probe(from_)) == sizeof(int); }; #ifdef _MSC_VER #pragma warning(pop)