amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-11 08:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed Windows build

Browse Source
This commit is contained in:
Niels committed 2015-07-19 13:33:03 +02:00
1 parent 623c03bc49
commit 300fba6388
2 files changed
+721 -322
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/json.hpp
+713 -319
View File
File diff suppressed because it is too large. Load diff
src/json.hpp.re2c
+8 -3
View File
@@ -4848,11 +4848,16 @@ class basic_json
struct internal_iterator
{
/// iterator for JSON objects
typename object_t::iterator object_iterator = typename object_t::iterator();
typename object_t::iterator object_iterator;
/// iterator for JSON arrays
typename array_t::iterator array_iterator = typename array_t::iterator();
typename array_t::iterator array_iterator;
/// generic iterator for all other types
primitive_iterator_t primitive_iterator = primitive_iterator_t();
primitive_iterator_t primitive_iterator;
/// create an uninitialized internal_iterator
internal_iterator()
: object_iterator(), array_iterator(), primitive_iterator()
{}
};
public: