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
9b764ee5
Unverified
Commit
9b764ee5
authored
May 13, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🏁
fix for #581
parent
978255da
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
src/json.hpp
src/json.hpp
+9
-9
No files found.
src/json.hpp
View file @
9b764ee5
...
...
@@ -7892,21 +7892,21 @@ class basic_json
/// conversion operator (calls key())
operator
typename
basic_json
::
string_t
()
const
{
return proxy.key();
return
proxy
.
key
();
}
/// equal operator (calls key())
template
<
typename
KeyType
>
bool
operator
==
(
const
KeyType
&
key
)
const
{
return proxy.key() == key;
return
proxy
.
key
()
==
key
;
}
/// not equal operator (calls key())
template
<
typename
KeyType
>
bool
operator
!=
(
const
KeyType
&
key
)
const
{
return proxy.key() != key;
return
proxy
.
key
()
!=
key
;
}
};
...
...
@@ -7925,29 +7925,29 @@ class basic_json
/// conversion operator (calls value())
operator
typename
IteratorType
::
reference
()
const
{
return proxy.value();
return
proxy
.
value
();
}
/// equal operator (calls value())
template
<
typename
ValueType
>
bool
operator
==
(
const
ValueType
&
value
)
const
{
return proxy.value() == value;
return
proxy
.
value
()
==
value
;
}
/// not equal operator (calls value())
template
<
typename
ValueType
>
bool
operator
!=
(
const
ValueType
&
value
)
const
{
return proxy.value() != value;
return
proxy
.
value
()
!=
value
;
}
/// assignment operator (calls value())
template
<
typename
ValueType
>
iterator_value_property
<
ProxyType
>&
operator
=
(
const
ValueType
&
value
)
{
proxy.value() = value;
return *this;
proxy
.
value
()
=
value
;
return
*
this
;
}
};
...
...
@@ -9005,7 +9005,7 @@ class basic_json
{
// avoid reading too many characters
const
size_t
max_length
=
static_cast
<
size_t
>
(
limit
-
start
);
return std::string(start + offset, std::min(
{length, max_length - offset}
));
return
std
::
string
(
start
+
offset
,
std
::
min
(
length
,
max_length
-
offset
));
}
private:
...
...
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