Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
72476b42
Commit
72476b42
authored
Dec 07, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup after #153
parent
f36f316f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
README.md
README.md
+1
-0
json.hpp
src/json.hpp
+1
-1
json.hpp.re2c
src/json.hpp.re2c
+1
-1
No files found.
README.md
View file @
72476b42
...
@@ -381,6 +381,7 @@ I deeply appreciate the help of the following people.
...
@@ -381,6 +381,7 @@ I deeply appreciate the help of the following people.
-
[
Silverweed
](
https://github.com/silverweed
)
overloaded
`parse()`
to accept an rvalue reference.
-
[
Silverweed
](
https://github.com/silverweed
)
overloaded
`parse()`
to accept an rvalue reference.
-
[
dariomt
](
https://github.com/dariomt
)
fixed a subtlety in MSVC type support.
-
[
dariomt
](
https://github.com/dariomt
)
fixed a subtlety in MSVC type support.
-
[
ZahlGraf
](
https://github.com/ZahlGraf
)
added a workaround that allows compilation using Android NDK.
-
[
ZahlGraf
](
https://github.com/ZahlGraf
)
added a workaround that allows compilation using Android NDK.
-
[
Eau Claire
](
https://github.com/whackashoe
)
replaced a function that was marked as unsafe by Visual Studio.
Thanks a lot for helping out!
Thanks a lot for helping out!
...
...
src/json.hpp
View file @
72476b42
...
@@ -2404,7 +2404,7 @@ class basic_json
...
@@ -2404,7 +2404,7 @@ class basic_json
template
<
typename
PointerType
,
typename
template
<
typename
PointerType
,
typename
std
::
enable_if
<
std
::
enable_if
<
std
::
is_pointer
<
PointerType
>::
value
std
::
is_pointer
<
PointerType
>::
value
and
std
::
is_const
<
typename
std
::
remove_pointer
<
PointerType
>::
type
>::
value
and
std
::
is_const
<
typename
std
::
remove_pointer
<
PointerType
>::
type
>::
value
,
int
>::
type
=
0
>
,
int
>::
type
=
0
>
const
PointerType
get_ptr
()
const
noexcept
const
PointerType
get_ptr
()
const
noexcept
{
{
...
...
src/json.hpp.re2c
View file @
72476b42
...
@@ -2404,7 +2404,7 @@ class basic_json
...
@@ -2404,7 +2404,7 @@ class basic_json
template<typename PointerType, typename
template<typename PointerType, typename
std::enable_if<
std::enable_if<
std::is_pointer<PointerType>::value
std::is_pointer<PointerType>::value
and std::is_const<
typename std::remove_pointer<PointerType>::type
>::value
and std::is_const<
typename std::remove_pointer<PointerType>::type
>::value
, int>::type = 0>
, int>::type = 0>
const PointerType get_ptr() const noexcept
const PointerType get_ptr() const 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