From 4fb825dbce2edc89838fde1ba864960d93fee77e Mon Sep 17 00:00:00 2001 From: Niels Date: Sat, 20 Jun 2015 15:47:37 +0200 Subject: [PATCH] fixed compiler warnings --- src/json.hpp | 10 +++++++--- src/json.hpp.re2c | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index c027fbf47..95bfe9de1 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -2900,7 +2900,7 @@ class basic_json /// associated JSON instance pointer m_object = nullptr; /// the actual iterator of the associated instance - internal_iterator m_it; + internal_iterator m_it = internal_iterator(); }; /// a const random access iterator for the basic_json class @@ -3395,7 +3395,7 @@ class basic_json /// associated JSON instance pointer m_object = nullptr; /// the actual iterator of the associated instance - internal_iterator m_it; + internal_iterator m_it = internal_iterator(); }; /// a reverse random access iterator for the basic_json class @@ -3488,7 +3488,7 @@ class basic_json m_limit = m_content + s.size(); } lexer(std::istream* s) noexcept - : m_stream(s) + : m_stream(s), m_buffer() { getline(*m_stream, m_buffer); m_content = reinterpret_cast(m_buffer.c_str()); @@ -3499,6 +3499,10 @@ class basic_json /// default constructor lexer() = default; + // switch of unwanted functions + lexer(const lexer&) = delete; + lexer operator=(const lexer&) = delete; + /*! @brief create a string from a Unicode code point diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index 95d5537fb..a6f02baa6 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -2900,7 +2900,7 @@ class basic_json /// associated JSON instance pointer m_object = nullptr; /// the actual iterator of the associated instance - internal_iterator m_it; + internal_iterator m_it = internal_iterator(); }; /// a const random access iterator for the basic_json class @@ -3395,7 +3395,7 @@ class basic_json /// associated JSON instance pointer m_object = nullptr; /// the actual iterator of the associated instance - internal_iterator m_it; + internal_iterator m_it = internal_iterator(); }; /// a reverse random access iterator for the basic_json class @@ -3488,7 +3488,7 @@ class basic_json m_limit = m_content + s.size(); } lexer(std::istream* s) noexcept - : m_stream(s) + : m_stream(s), m_buffer() { getline(*m_stream, m_buffer); m_content = reinterpret_cast(m_buffer.c_str()); @@ -3499,6 +3499,10 @@ class basic_json /// default constructor lexer() = default; + // switch of unwanted functions + lexer(const lexer&) = delete; + lexer operator=(const lexer&) = delete; + /*! @brief create a string from a Unicode code point