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
f80827d0
Unverified
Commit
f80827d0
authored
7 years ago
by
Niels Lohmann
Committed by
GitHub
7 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #873 from nlohmann/feature/issue872
remove C4996 warnings #872
parents
f7ae143a
a9a4ff61
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
src/json.hpp
src/json.hpp
+4
-5
No files found.
src/json.hpp
View file @
f80827d0
...
...
@@ -8028,7 +8028,6 @@ class basic_json
static
T
*
create
(
Args
&&
...
args
)
{
AllocatorType
<
T
>
alloc
;
using
AllocatorTraits
=
std
::
allocator_traits
<
AllocatorType
<
T
>>
;
auto
deleter
=
[
&
](
T
*
object
)
...
...
@@ -10719,8 +10718,8 @@ class basic_json
if
(
is_string
())
{
AllocatorType
<
string_t
>
alloc
;
alloc
.
destroy
(
m_value
.
string
);
alloc
.
deallocate
(
m_value
.
string
,
1
);
std
::
allocator_traits
<
decltype
(
alloc
)
>::
destroy
(
alloc
,
m_value
.
string
);
std
::
allocator_traits
<
decltype
(
alloc
)
>::
deallocate
(
alloc
,
m_value
.
string
,
1
);
m_value
.
string
=
nullptr
;
}
...
...
@@ -10825,8 +10824,8 @@ class basic_json
if
(
is_string
())
{
AllocatorType
<
string_t
>
alloc
;
alloc
.
destroy
(
m_value
.
string
);
alloc
.
deallocate
(
m_value
.
string
,
1
);
std
::
allocator_traits
<
decltype
(
alloc
)
>::
destroy
(
alloc
,
m_value
.
string
);
std
::
allocator_traits
<
decltype
(
alloc
)
>::
deallocate
(
alloc
,
m_value
.
string
,
1
);
m_value
.
string
=
nullptr
;
}
...
...
This diff is collapsed.
Click to expand it.
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