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
97559bb1
Unverified
Commit
97559bb1
authored
Mar 08, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
trying to fix the leak
Part 1: properly use forwarding
parent
38345fd0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
include/nlohmann/detail/input/lexer.hpp
include/nlohmann/detail/input/lexer.hpp
+1
-1
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+3
-3
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+4
-4
No files found.
include/nlohmann/detail/input/lexer.hpp
View file @
97559bb1
...
...
@@ -1130,7 +1130,7 @@ scan_number_done:
}
/// return current string value (implicitly resets the token; useful only once)
std
::
string
move_string
()
std
::
string
&&
move_string
()
{
return
std
::
move
(
token_buffer
);
}
...
...
include/nlohmann/json.hpp
View file @
97559bb1
...
...
@@ -953,7 +953,7 @@ class basic_json
/// constructor for rvalue strings
json_value
(
string_t
&&
value
)
{
string
=
create
<
string_t
>
(
std
::
move
(
value
));
string
=
create
<
string_t
>
(
std
::
forward
<
string_t
&&
>
(
value
));
}
/// constructor for objects
...
...
@@ -965,7 +965,7 @@ class basic_json
/// constructor for rvalue objects
json_value
(
object_t
&&
value
)
{
object
=
create
<
object_t
>
(
std
::
move
(
value
));
object
=
create
<
object_t
>
(
std
::
forward
<
object_t
&&
>
(
value
));
}
/// constructor for arrays
...
...
@@ -977,7 +977,7 @@ class basic_json
/// constructor for rvalue arrays
json_value
(
array_t
&&
value
)
{
array
=
create
<
array_t
>
(
std
::
move
(
value
));
array
=
create
<
array_t
>
(
std
::
forward
<
array_t
&&
>
(
value
));
}
void
destroy
(
value_t
t
)
noexcept
...
...
single_include/nlohmann/json.hpp
View file @
97559bb1
...
...
@@ -2969,7 +2969,7 @@ scan_number_done:
}
/// return current string value (implicitly resets the token; useful only once)
std
::
string
move_string
()
std
::
string
&&
move_string
()
{
return
std
::
move
(
token_buffer
);
}
...
...
@@ -10561,7 +10561,7 @@ class basic_json
/// constructor for rvalue strings
json_value
(
string_t
&&
value
)
{
string
=
create
<
string_t
>
(
std
::
move
(
value
));
string
=
create
<
string_t
>
(
std
::
forward
<
string_t
&&
>
(
value
));
}
/// constructor for objects
...
...
@@ -10573,7 +10573,7 @@ class basic_json
/// constructor for rvalue objects
json_value
(
object_t
&&
value
)
{
object
=
create
<
object_t
>
(
std
::
move
(
value
));
object
=
create
<
object_t
>
(
std
::
forward
<
object_t
&&
>
(
value
));
}
/// constructor for arrays
...
...
@@ -10585,7 +10585,7 @@ class basic_json
/// constructor for rvalue arrays
json_value
(
array_t
&&
value
)
{
array
=
create
<
array_t
>
(
std
::
move
(
value
));
array
=
create
<
array_t
>
(
std
::
forward
<
array_t
&&
>
(
value
));
}
void
destroy
(
value_t
t
)
noexcept
...
...
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