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
c7afb34e
Unverified
Commit
c7afb34e
authored
Mar 11, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎨
cleanup after #496
Ran “make pretty” and added a note to the README file.
parent
754ce0b9
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
845 additions
and
298 deletions
+845
-298
README.md
README.md
+1
-1
src/json.hpp
src/json.hpp
+840
-293
test/src/unit-udt.cpp
test/src/unit-udt.cpp
+4
-4
No files found.
README.md
View file @
c7afb34e
...
...
@@ -828,7 +828,7 @@ I deeply appreciate the help of the following people.
-
[
rswanson-ihi
](
https://github.com/rswanson-ihi
)
noted a typo in the README.
-
[
Mihai Stan
](
https://github.com/stanmihai4
)
fixed a bug in the comparison with
`nullptr`
s.
-
[
Tushar Maheshwari
](
https://github.com/tusharpm
)
added
[
cotire
](
https://github.com/sakra/cotire
)
support to speed up the compilation.
-
[
TedLyngmo
](
https://github.com/TedLyngmo
)
noted a typo in the README.
-
[
TedLyngmo
](
https://github.com/TedLyngmo
)
noted a typo in the README
and fixed some
`-Weffc++`
warnings
.
Thanks a lot for helping out! Please
[
let me know
](
mailto:mail@nlohmann.me
)
if I forgot someone.
...
...
src/json.hpp
View file @
c7afb34e
This diff is collapsed.
Click to expand it.
test/src/unit-udt.cpp
View file @
c7afb34e
...
...
@@ -49,19 +49,19 @@ enum class country
struct
age
{
int
m_val
;
age
(
int
rhs
=
0
)
:
m_val
(
rhs
)
{}
age
(
int
rhs
=
0
)
:
m_val
(
rhs
)
{}
};
struct
name
{
std
::
string
m_val
;
name
(
const
std
::
string
rhs
=
""
)
:
m_val
(
rhs
)
{}
name
(
const
std
::
string
rhs
=
""
)
:
m_val
(
rhs
)
{}
};
struct
address
{
std
::
string
m_val
;
address
(
const
std
::
string
rhs
=
""
)
:
m_val
(
rhs
)
{}
address
(
const
std
::
string
rhs
=
""
)
:
m_val
(
rhs
)
{}
};
struct
person
...
...
@@ -69,7 +69,7 @@ struct person
age
m_age
;
name
m_name
;
country
m_country
;
person
()
:
m_age
(),
m_name
(),
m_country
()
{}
person
()
:
m_age
(),
m_name
(),
m_country
()
{}
person
(
const
age
&
a
,
const
name
&
n
,
const
country
&
c
)
:
m_age
(
a
),
m_name
(
n
),
m_country
(
c
)
{}
};
...
...
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