fixed compiler warnings

This commit is contained in:
Niels 2015-06-20 15:47:37 +02:00
parent bd8150c58e
commit 4fb825dbce
2 changed files with 14 additions and 6 deletions

View file

@ -2900,7 +2900,7 @@ class basic_json
/// associated JSON instance /// associated JSON instance
pointer m_object = nullptr; pointer m_object = nullptr;
/// the actual iterator of the associated instance /// 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 /// a const random access iterator for the basic_json class
@ -3395,7 +3395,7 @@ class basic_json
/// associated JSON instance /// associated JSON instance
pointer m_object = nullptr; pointer m_object = nullptr;
/// the actual iterator of the associated instance /// 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 /// a reverse random access iterator for the basic_json class
@ -3488,7 +3488,7 @@ class basic_json
m_limit = m_content + s.size(); m_limit = m_content + s.size();
} }
lexer(std::istream* s) noexcept lexer(std::istream* s) noexcept
: m_stream(s) : m_stream(s), m_buffer()
{ {
getline(*m_stream, m_buffer); getline(*m_stream, m_buffer);
m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str()); m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
@ -3499,6 +3499,10 @@ class basic_json
/// default constructor /// default constructor
lexer() = default; lexer() = default;
// switch of unwanted functions
lexer(const lexer&) = delete;
lexer operator=(const lexer&) = delete;
/*! /*!
@brief create a string from a Unicode code point @brief create a string from a Unicode code point

View file

@ -2900,7 +2900,7 @@ class basic_json
/// associated JSON instance /// associated JSON instance
pointer m_object = nullptr; pointer m_object = nullptr;
/// the actual iterator of the associated instance /// 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 /// a const random access iterator for the basic_json class
@ -3395,7 +3395,7 @@ class basic_json
/// associated JSON instance /// associated JSON instance
pointer m_object = nullptr; pointer m_object = nullptr;
/// the actual iterator of the associated instance /// 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 /// a reverse random access iterator for the basic_json class
@ -3488,7 +3488,7 @@ class basic_json
m_limit = m_content + s.size(); m_limit = m_content + s.size();
} }
lexer(std::istream* s) noexcept lexer(std::istream* s) noexcept
: m_stream(s) : m_stream(s), m_buffer()
{ {
getline(*m_stream, m_buffer); getline(*m_stream, m_buffer);
m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str()); m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
@ -3499,6 +3499,10 @@ class basic_json
/// default constructor /// default constructor
lexer() = default; lexer() = default;
// switch of unwanted functions
lexer(const lexer&) = delete;
lexer operator=(const lexer&) = delete;
/*! /*!
@brief create a string from a Unicode code point @brief create a string from a Unicode code point