From 56f6d1d68e618649aa56b58d1602a139f8000d92 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 17 Mar 2019 15:20:22 +0100 Subject: [PATCH] :green_heart: fix CI and #1521 --- include/nlohmann/detail/input/binary_reader.hpp | 4 ++-- include/nlohmann/detail/input/json_sax.hpp | 4 ++-- include/nlohmann/detail/json_ref.hpp | 2 +- include/nlohmann/detail/output/serializer.hpp | 2 +- single_include/nlohmann/json.hpp | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index cded3b54..3ac10990 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -54,9 +54,9 @@ class binary_reader // make class move-only binary_reader(const binary_reader&) = delete; - binary_reader(binary_reader&&) noexcept = default; + binary_reader(binary_reader&&) = default; binary_reader& operator=(const binary_reader&) = delete; - binary_reader& operator=(binary_reader&&) noexcept = default; + binary_reader& operator=(binary_reader&&) = default; ~binary_reader() = default; /*! diff --git a/include/nlohmann/detail/input/json_sax.hpp b/include/nlohmann/detail/input/json_sax.hpp index 097b33e5..f82255af 100644 --- a/include/nlohmann/detail/input/json_sax.hpp +++ b/include/nlohmann/detail/input/json_sax.hpp @@ -161,9 +161,9 @@ class json_sax_dom_parser // make class move-only json_sax_dom_parser(const json_sax_dom_parser&) = delete; - json_sax_dom_parser(json_sax_dom_parser&&) noexcept = default; + json_sax_dom_parser(json_sax_dom_parser&&) = default; json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete; - json_sax_dom_parser& operator=(json_sax_dom_parser&&) noexcept = default; + json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; ~json_sax_dom_parser() = default; bool null() diff --git a/include/nlohmann/detail/json_ref.hpp b/include/nlohmann/detail/json_ref.hpp index 26da3964..c8dec733 100644 --- a/include/nlohmann/detail/json_ref.hpp +++ b/include/nlohmann/detail/json_ref.hpp @@ -35,7 +35,7 @@ class json_ref is_rvalue(true) {} // class should be movable only - json_ref(json_ref&&) noexcept = default; + json_ref(json_ref&&) = default; json_ref(const json_ref&) = delete; json_ref& operator=(const json_ref&) = delete; json_ref& operator=(json_ref&&) = delete; diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 430eff62..31174eac 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -626,7 +626,7 @@ class serializer } // use a pointer to fill the buffer - auto buffer_ptr = begin(number_buffer); + auto buffer_ptr = number_buffer.begin(); const bool is_negative = std::is_same::value and not(x >= 0); // see issue #755 number_unsigned_t abs_value; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 8e677438..338d2b0d 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -2839,9 +2839,9 @@ class json_sax_dom_parser // make class move-only json_sax_dom_parser(const json_sax_dom_parser&) = delete; - json_sax_dom_parser(json_sax_dom_parser&&) noexcept = default; + json_sax_dom_parser(json_sax_dom_parser&&) = default; json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete; - json_sax_dom_parser& operator=(json_sax_dom_parser&&) noexcept = default; + json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; ~json_sax_dom_parser() = default; bool null() @@ -3579,9 +3579,9 @@ class binary_reader // make class move-only binary_reader(const binary_reader&) = delete; - binary_reader(binary_reader&&) noexcept = default; + binary_reader(binary_reader&&) = default; binary_reader& operator=(const binary_reader&) = delete; - binary_reader& operator=(binary_reader&&) noexcept = default; + binary_reader& operator=(binary_reader&&) = default; ~binary_reader() = default; /*! @@ -9258,7 +9258,7 @@ class json_ref is_rvalue(true) {} // class should be movable only - json_ref(json_ref&&) noexcept = default; + json_ref(json_ref&&) = default; json_ref(const json_ref&) = delete; json_ref& operator=(const json_ref&) = delete; json_ref& operator=(json_ref&&) = delete; @@ -12490,7 +12490,7 @@ class serializer } // use a pointer to fill the buffer - auto buffer_ptr = begin(number_buffer); + auto buffer_ptr = number_buffer.begin(); const bool is_negative = std::is_same::value and not(x >= 0); // see issue #755 number_unsigned_t abs_value;