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
aeef5070
Commit
aeef5070
authored
Jun 22, 2020
by
chenguoping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
to allow for ADL in int_to_string() function
parent
691fb0c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
include/nlohmann/detail/iterators/iteration_proxy.hpp
include/nlohmann/detail/iterators/iteration_proxy.hpp
+3
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+3
-1
No files found.
include/nlohmann/detail/iterators/iteration_proxy.hpp
View file @
aeef5070
...
...
@@ -16,7 +16,9 @@ template<typename string_type, typename std::enable_if<
std
::
is_same
<
char
,
typename
string_type
::
value_type
>
::
value
,
int
>::
type
=
0
>
void
int_to_string
(
string_type
&
target
,
std
::
size_t
value
)
{
target
=
std
::
to_string
(
value
);
// For ADL
using
std
::
to_string
;
target
=
to_string
(
value
);
}
template
<
typename
IteratorType
>
class
iteration_proxy_value
{
...
...
single_include/nlohmann/json.hpp
View file @
aeef5070
...
...
@@ -3654,7 +3654,9 @@ template<typename string_type, typename std::enable_if<
std::is_same<char, typename string_type::value_type>::value, int>::type = 0>
void int_to_string( string_type& target, std::size_t value )
{
target = std::to_string(value);
// For ADL
using std::to_string;
target = to_string(value);
}
template <typename IteratorType> class iteration_proxy_value
{
...
...
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