Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
3e65a652
Unverified
Commit
3e65a652
authored
Aug 14, 2017
by
Théo DELRIEU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add detail/iterators/internal_iterator.hpp
parent
51ecc31d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
17 deletions
+31
-17
Makefile
Makefile
+2
-1
src/detail/iterators/internal_iterator.hpp
src/detail/iterators/internal_iterator.hpp
+28
-0
src/json.hpp
src/json.hpp
+1
-16
No files found.
Makefile
View file @
3e65a652
...
@@ -13,7 +13,8 @@ SRCS = ${SRCDIR}/json.hpp \
...
@@ -13,7 +13,8 @@ SRCS = ${SRCDIR}/json.hpp \
${SRCDIR}
/detail/parsing/input_adapters.hpp
\
${SRCDIR}
/detail/parsing/input_adapters.hpp
\
${SRCDIR}
/detail/parsing/lexer.hpp
\
${SRCDIR}
/detail/parsing/lexer.hpp
\
${SRCDIR}
/detail/parsing/parser.hpp
\
${SRCDIR}
/detail/parsing/parser.hpp
\
${SRCDIR}
/detail/iterators/primitive_iterator.hpp
${SRCDIR}
/detail/iterators/primitive_iterator.hpp
\
${SRCDIR}
/detail/iterators/internal_iterator.hpp
...
...
src/detail/iterators/internal_iterator.hpp
0 → 100644
View file @
3e65a652
#ifndef NLOHMANN_JSON_DETAIL_ITERATORS_INTERNAL_ITERATOR_HPP
#define NLOHMANN_JSON_DETAIL_ITERATORS_INTERNAL_ITERATOR_HPP
#include "detail/iterators/primitive_iterator.hpp"
namespace
nlohmann
{
namespace
detail
{
/*!
@brief an iterator value
@note This structure could easily be a union, but MSVC currently does not allow
unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
*/
template
<
typename
BasicJsonType
>
struct
internal_iterator
{
/// iterator for JSON objects
typename
BasicJsonType
::
object_t
::
iterator
object_iterator
{};
/// iterator for JSON arrays
typename
BasicJsonType
::
array_t
::
iterator
array_iterator
{};
/// generic iterator for all other types
primitive_iterator_t
primitive_iterator
{};
};
}
}
#endif
src/json.hpp
View file @
3e65a652
...
@@ -61,6 +61,7 @@ SOFTWARE.
...
@@ -61,6 +61,7 @@ SOFTWARE.
#include "detail/parsing/lexer.hpp"
#include "detail/parsing/lexer.hpp"
#include "detail/parsing/parser.hpp"
#include "detail/parsing/parser.hpp"
#include "detail/iterators/primitive_iterator.hpp"
#include "detail/iterators/primitive_iterator.hpp"
#include "detail/iterators/internal_iterator.hpp"
/*!
/*!
@brief namespace for Niels Lohmann
@brief namespace for Niels Lohmann
...
@@ -75,22 +76,6 @@ namespace detail
...
@@ -75,22 +76,6 @@ namespace detail
// iterators //
// iterators //
///////////////
///////////////
/*!
@brief an iterator value
@note This structure could easily be a union, but MSVC currently does not allow
unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
*/
template
<
typename
BasicJsonType
>
struct
internal_iterator
{
/// iterator for JSON objects
typename
BasicJsonType
::
object_t
::
iterator
object_iterator
{};
/// iterator for JSON arrays
typename
BasicJsonType
::
array_t
::
iterator
array_iterator
{};
/// generic iterator for all other types
primitive_iterator_t
primitive_iterator
{};
};
template
<
typename
IteratorType
>
class
iteration_proxy
;
template
<
typename
IteratorType
>
class
iteration_proxy
;
/*!
/*!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment