amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-05-02 04:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔥 deprecated iterator_wrapper #874

Browse Source 
Also fixed some warnings from GCC.
This commit is contained in:
Niels Lohmann
2018-01-23 16:33:08 +01:00
parent 7eabb6ba36
commit 3c68a796df
10 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
develop/json.hpp
+12 -6
View File
@@ -4480,18 +4480,24 @@ class basic_json
@note The name of this function is not yet final and may change in the
future.
@deprecated This stream operator is deprecated and will be removed in
future 4.0.0 of the library. Please use @ref items() instead;
that is, replace `json::iterator_wrapper(j)` with `j.items()`.
*/
JSON_DEPRECATED
static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
{
return iteration_proxy<iterator>(ref);
return ref.items();
}
/*!
@copydoc iterator_wrapper(reference)
*/
JSON_DEPRECATED
static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
{
return iteration_proxy<const_iterator>(ref);
return ref.items();
}
/*!
@@ -6127,8 +6133,8 @@ class basic_json
/*!
@brief serialize to stream
@deprecated This stream operator is deprecated and will be removed in a
future version of the library. Please use
@deprecated This stream operator is deprecated and will be removed in
future 4.0.0 of the library. Please use
@ref operator<<(std::ostream&, const basic_json&)
instead; that is, replace calls like `j >> o;` with `o << j;`.
@since version 1.0.0; deprecated since version 3.0.0
@@ -6313,8 +6319,8 @@ class basic_json
/*!
@brief deserialize from stream
@deprecated This stream operator is deprecated and will be removed in a
future version of the library. Please use
@deprecated This stream operator is deprecated and will be removed in
version 4.0.0 of the library. Please use
@ref operator>>(std::istream&, basic_json&)
instead; that is, replace calls like `j << i;` with `i >> j;`.
@since version 1.0.0; deprecated since version 3.0.0