From 6e49d9f5ffb1f07b813e7ff1bad0ca80265a4a49 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 7 Oct 2018 21:34:40 +0200 Subject: [PATCH] :ambulance: fixed compilation error --- include/nlohmann/detail/input/lexer.hpp | 4 +-- include/nlohmann/detail/output/serializer.hpp | 4 +-- single_include/nlohmann/json.hpp | 32 ++++++++----------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 4204ab24..362b4f23 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -104,9 +104,9 @@ class lexer // delete because of pointer members lexer(const lexer&) = delete; - lexer(lexer&&) noexcept = default; + lexer(lexer&&) = delete; lexer& operator=(lexer&) = delete; - lexer& operator=(lexer&&) noexcept = default; + lexer& operator=(lexer&&) = delete; ~lexer() = default; private: diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 6088ebe8..bb74a86e 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -53,8 +53,8 @@ class serializer // delete because of pointer members serializer(const serializer&) = delete; serializer& operator=(const serializer&) = delete; - serializer(serializer&&) noexcept = default; - serializer& operator=(serializer&&) noexcept = default; + serializer(serializer&&) = delete; + serializer& operator=(serializer&&) = delete; ~serializer() = default; /*! diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 7abcb127..583eb874 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -2373,9 +2373,9 @@ class lexer // delete because of pointer members lexer(const lexer&) = delete; - lexer(lexer&&) noexcept = default; + lexer(lexer&&) = delete; lexer& operator=(lexer&) = delete; - lexer& operator=(lexer&&) noexcept = default; + lexer& operator=(lexer&&) = delete; ~lexer() = default; private: @@ -8510,22 +8510,20 @@ class binary_writer { return 'i'; } - else if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) + if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) { return 'U'; } - else if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) + if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) { return 'I'; } - else if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) + if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) { return 'l'; } - else // no check and assume int64_t (see note above) - { - return 'L'; - } + // no check and assume int64_t (see note above) + return 'L'; } case value_t::number_unsigned: @@ -8534,22 +8532,20 @@ class binary_writer { return 'i'; } - else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { return 'U'; } - else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { return 'I'; } - else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { return 'l'; } - else // no check and assume int64_t (see note above) - { - return 'L'; - } + // no check and assume int64_t (see note above) + return 'L'; } case value_t::number_float: @@ -9765,8 +9761,8 @@ class serializer // delete because of pointer members serializer(const serializer&) = delete; serializer& operator=(const serializer&) = delete; - serializer(serializer&&) noexcept = default; - serializer& operator=(serializer&&) noexcept = default; + serializer(serializer&&) = delete; + serializer& operator=(serializer&&) = delete; ~serializer() = default; /*!