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
0245ae51
Unverified
Commit
0245ae51
authored
Oct 17, 2019
by
Niels Lohmann
Committed by
GitHub
Oct 17, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1797 from t-b/fix-integer-truncation
iteration_proxy: Fix integer truncation from std::size_t to int
parents
4c061918
35b47c27
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
include/nlohmann/detail/iterators/iteration_proxy.hpp
include/nlohmann/detail/iterators/iteration_proxy.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+1
-1
test/src/unit-alt-string.cpp
test/src/unit-alt-string.cpp
+1
-1
No files found.
include/nlohmann/detail/iterators/iteration_proxy.hpp
View file @
0245ae51
...
@@ -13,7 +13,7 @@ namespace nlohmann
...
@@ -13,7 +13,7 @@ namespace nlohmann
namespace
detail
namespace
detail
{
{
template
<
typename
string_type
>
template
<
typename
string_type
>
void
int_to_string
(
string_type
&
target
,
in
t
value
)
void
int_to_string
(
string_type
&
target
,
std
::
size_
t
value
)
{
{
target
=
std
::
to_string
(
value
);
target
=
std
::
to_string
(
value
);
}
}
...
...
single_include/nlohmann/json.hpp
View file @
0245ae51
...
@@ -3277,7 +3277,7 @@ namespace nlohmann
...
@@ -3277,7 +3277,7 @@ namespace nlohmann
namespace
detail
namespace
detail
{
{
template
<
typename
string_type
>
template
<
typename
string_type
>
void
int_to_string
(
string_type
&
target
,
in
t
value
)
void
int_to_string
(
string_type
&
target
,
std
::
size_
t
value
)
{
{
target
=
std
::
to_string
(
value
);
target
=
std
::
to_string
(
value
);
}
}
...
...
test/src/unit-alt-string.cpp
View file @
0245ae51
...
@@ -154,7 +154,7 @@ class alt_string
...
@@ -154,7 +154,7 @@ class alt_string
friend
bool
::
operator
<
(
const
char
*
,
const
alt_string
&
);
friend
bool
::
operator
<
(
const
char
*
,
const
alt_string
&
);
};
};
void
int_to_string
(
alt_string
&
target
,
in
t
value
)
void
int_to_string
(
alt_string
&
target
,
std
::
size_
t
value
)
{
{
target
=
std
::
to_string
(
value
).
c_str
();
target
=
std
::
to_string
(
value
).
c_str
();
}
}
...
...
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