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
adc065d3
Commit
adc065d3
authored
Jun 04, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
included fixes for MSVC (see #62)
94de11e, f673c8d, 540b763
parent
29512ae9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
32 deletions
+36
-32
src/json.hpp
src/json.hpp
+18
-16
src/json.hpp.re2c
src/json.hpp.re2c
+18
-16
No files found.
src/json.hpp
View file @
adc065d3
...
...
@@ -139,9 +139,10 @@ class basic_json
///////////////////////////
/// a type for an object
using
object_t
=
ObjectType
<
StringType
,
basic_json
>
;
using
object_t
=
ObjectType
<
StringType
,
basic_json
,
std
::
less
<
StringType
>
,
AllocatorType
<
std
::
pair
<
const
StringType
,
basic_json
>>>
;
/// a type for an array
using
array_t
=
ArrayType
<
basic_json
>
;
using
array_t
=
ArrayType
<
basic_json
,
AllocatorType
<
basic_json
>
>
;
/// a type for a string
using
string_t
=
StringType
;
/// a type for a boolean
...
...
@@ -2350,15 +2351,15 @@ class basic_json
public:
/// the type of the values when the iterator is dereferenced
using
value_type
=
basic_json
::
value_type
;
using
value_type
=
typename
basic_json
::
value_type
;
/// a type to represent differences between iterators
using
difference_type
=
basic_json
::
difference_type
;
using
difference_type
=
typename
basic_json
::
difference_type
;
/// defines a pointer to the type iterated over (value_type)
using
pointer
=
basic_json
::
pointer
;
using
pointer
=
typename
basic_json
::
pointer
;
/// defines a reference to the type iterated over (value_type)
using
reference
=
basic_json
::
reference
;
using
reference
=
typename
basic_json
::
reference
;
/// the category of the iterator
using
iterator_category
=
std
::
bidirectional_iterator_tag
;
using
iterator_category
=
typename
std
::
bidirectional_iterator_tag
;
/// default constructor
inline
iterator
()
=
default
;
...
...
@@ -2866,15 +2867,15 @@ class basic_json
public:
/// the type of the values when the iterator is dereferenced
using
value_type
=
basic_json
::
value_type
;
using
value_type
=
typename
basic_json
::
value_type
;
/// a type to represent differences between iterators
using
difference_type
=
basic_json
::
difference_type
;
using
difference_type
=
typename
basic_json
::
difference_type
;
/// defines a pointer to the type iterated over (value_type)
using
pointer
=
basic_json
::
const_pointer
;
using
pointer
=
typename
basic_json
::
const_pointer
;
/// defines a reference to the type iterated over (value_type)
using
reference
=
basic_json
::
const_reference
;
using
reference
=
typename
basic_json
::
const_reference
;
/// the category of the iterator
using
iterator_category
=
std
::
bidirectional_iterator_tag
;
using
iterator_category
=
typename
std
::
bidirectional_iterator_tag
;
/// default constructor
inline
const_iterator
()
=
default
;
...
...
@@ -3394,10 +3395,11 @@ class basic_json
};
/// a reverse random access iterator for the basic_json class
class
reverse_iterator
:
private
std
::
reverse_iterator
<
basic_json
::
iterator
>
class
reverse_iterator
:
private
std
::
reverse_iterator
<
typename
basic_json
::
iterator
>
{
public:
inline
reverse_iterator
(
const
typename
std
::
reverse_iterator
<
basic_json
::
iterator
>::
iterator_type
&
inline
reverse_iterator
(
const
typename
std
::
reverse_iterator
<
typename
basic_json
::
iterator
>::
iterator_type
&
it
)
:
std
::
reverse_iterator
<
basic_json
::
iterator
>
(
it
)
{}
...
...
@@ -3415,11 +3417,11 @@ class basic_json
};
/// a const reverse random access iterator for the basic_json class
class
const_reverse_iterator
:
private
std
::
reverse_iterator
<
basic_json
::
const_iterator
>
class
const_reverse_iterator
:
private
std
::
reverse_iterator
<
typename
basic_json
::
const_iterator
>
{
public:
inline
const_reverse_iterator
(
const
typename
std
::
reverse_iterator
<
basic_json
::
const_iterator
>::
iterator_type
&
it
)
std
::
reverse_iterator
<
typename
basic_json
::
const_iterator
>::
iterator_type
&
it
)
:
std
::
reverse_iterator
<
basic_json
::
const_iterator
>
(
it
)
{}
/// return the key of an object iterator
...
...
src/json.hpp.re2c
View file @
adc065d3
...
...
@@ -139,9 +139,10 @@ class basic_json
///////////////////////////
/// a type for an object
using object_t = ObjectType<StringType, basic_json>;
using object_t =
ObjectType<StringType, basic_json, std::less<StringType>, AllocatorType<std::pair<const StringType, basic_json>>>;
/// a type for an array
using array_t = ArrayType<basic_json>;
using array_t = ArrayType<basic_json
, AllocatorType<basic_json>
>;
/// a type for a string
using string_t = StringType;
/// a type for a boolean
...
...
@@ -2350,15 +2351,15 @@ class basic_json
public:
/// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type;
using value_type =
typename
basic_json::value_type;
/// a type to represent differences between iterators
using difference_type = basic_json::difference_type;
using difference_type =
typename
basic_json::difference_type;
/// defines a pointer to the type iterated over (value_type)
using pointer = basic_json::pointer;
using pointer =
typename
basic_json::pointer;
/// defines a reference to the type iterated over (value_type)
using reference = basic_json::reference;
using reference =
typename
basic_json::reference;
/// the category of the iterator
using iterator_category = std::bidirectional_iterator_tag;
using iterator_category =
typename
std::bidirectional_iterator_tag;
/// default constructor
inline iterator() = default;
...
...
@@ -2866,15 +2867,15 @@ class basic_json
public:
/// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type;
using value_type =
typename
basic_json::value_type;
/// a type to represent differences between iterators
using difference_type = basic_json::difference_type;
using difference_type =
typename
basic_json::difference_type;
/// defines a pointer to the type iterated over (value_type)
using pointer = basic_json::const_pointer;
using pointer =
typename
basic_json::const_pointer;
/// defines a reference to the type iterated over (value_type)
using reference = basic_json::const_reference;
using reference =
typename
basic_json::const_reference;
/// the category of the iterator
using iterator_category = std::bidirectional_iterator_tag;
using iterator_category =
typename
std::bidirectional_iterator_tag;
/// default constructor
inline const_iterator() = default;
...
...
@@ -3394,10 +3395,11 @@ class basic_json
};
/// a reverse random access iterator for the basic_json class
class reverse_iterator : private std::reverse_iterator<basic_json::iterator>
class reverse_iterator : private std::reverse_iterator<
typename
basic_json::iterator>
{
public:
inline reverse_iterator(const typename std::reverse_iterator<basic_json::iterator>::iterator_type&
inline reverse_iterator(const typename
std::reverse_iterator<typename basic_json::iterator>::iterator_type&
it)
: std::reverse_iterator<basic_json::iterator>(it) {}
...
...
@@ -3415,11 +3417,11 @@ class basic_json
};
/// a const reverse random access iterator for the basic_json class
class const_reverse_iterator : private std::reverse_iterator<basic_json::const_iterator>
class const_reverse_iterator : private std::reverse_iterator<
typename
basic_json::const_iterator>
{
public:
inline const_reverse_iterator(const typename
std::reverse_iterator<basic_json::const_iterator>::iterator_type& it)
std::reverse_iterator<
typename
basic_json::const_iterator>::iterator_type& it)
: std::reverse_iterator<basic_json::const_iterator>(it) {}
/// return the key of an object iterator
...
...
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