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
8173c370
Commit
8173c370
authored
Oct 06, 2016
by
Niels Lohmann
Committed by
GitHub
Oct 06, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #321 from vasild/develop
Fix usage examples' comments for std::multiset
parents
b6550b35
b5128b16
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
README.md
README.md
+2
-2
basic_json__CompatibleArrayType.cpp
doc/examples/basic_json__CompatibleArrayType.cpp
+1
-1
unit-readme.cpp
test/src/unit-readme.cpp
+2
-2
No files found.
README.md
View file @
8173c370
...
@@ -283,8 +283,8 @@ json j_uset(c_uset); // only one entry for "one" is used
...
@@ -283,8 +283,8 @@ json j_uset(c_uset); // only one entry for "one" is used
// maybe ["two", "three", "four", "one"]
// maybe ["two", "three", "four", "one"]
std
::
multiset
<
std
::
string
>
c_mset
{
"one"
,
"two"
,
"one"
,
"four"
};
std
::
multiset
<
std
::
string
>
c_mset
{
"one"
,
"two"
,
"one"
,
"four"
};
json
j_mset
(
c_mset
);
//
only one entry for "one" is
used
json
j_mset
(
c_mset
);
//
both entries for "one" are
used
// maybe ["one", "two", "four"]
// maybe ["one", "two", "
one", "
four"]
std
::
unordered_multiset
<
std
::
string
>
c_umset
{
"one"
,
"two"
,
"one"
,
"four"
};
std
::
unordered_multiset
<
std
::
string
>
c_umset
{
"one"
,
"two"
,
"one"
,
"four"
};
json
j_umset
(
c_umset
);
// both entries for "one" are used
json
j_umset
(
c_umset
);
// both entries for "one" are used
...
...
doc/examples/basic_json__CompatibleArrayType.cpp
View file @
8173c370
...
@@ -39,7 +39,7 @@ int main()
...
@@ -39,7 +39,7 @@ int main()
// create an array from std::multiset
// create an array from std::multiset
std
::
multiset
<
std
::
string
>
c_mset
{
"one"
,
"two"
,
"one"
,
"four"
};
std
::
multiset
<
std
::
string
>
c_mset
{
"one"
,
"two"
,
"one"
,
"four"
};
json
j_mset
(
c_mset
);
//
only one entry for "one" is
used
json
j_mset
(
c_mset
);
//
both entries for "one" are
used
// create an array from std::unordered_multiset
// create an array from std::unordered_multiset
std
::
unordered_multiset
<
std
::
string
>
c_umset
{
"one"
,
"two"
,
"one"
,
"four"
};
std
::
unordered_multiset
<
std
::
string
>
c_umset
{
"one"
,
"two"
,
"one"
,
"four"
};
...
...
test/src/unit-readme.cpp
View file @
8173c370
...
@@ -208,8 +208,8 @@ TEST_CASE("README", "[hide]")
...
@@ -208,8 +208,8 @@ TEST_CASE("README", "[hide]")
// maybe ["two", "three", "four", "one"]
// maybe ["two", "three", "four", "one"]
std
::
multiset
<
std
::
string
>
c_mset
{
"one"
,
"two"
,
"one"
,
"four"
};
std
::
multiset
<
std
::
string
>
c_mset
{
"one"
,
"two"
,
"one"
,
"four"
};
json
j_mset
(
c_mset
);
//
only one entry for "one" is
used
json
j_mset
(
c_mset
);
//
both entries for "one" are
used
// maybe ["one", "two", "four"]
// maybe ["one", "two", "
one", "
four"]
std
::
unordered_multiset
<
std
::
string
>
c_umset
{
"one"
,
"two"
,
"one"
,
"four"
};
std
::
unordered_multiset
<
std
::
string
>
c_umset
{
"one"
,
"two"
,
"one"
,
"four"
};
json
j_umset
(
c_umset
);
// both entries for "one" are used
json
j_umset
(
c_umset
);
// both entries for "one" are used
...
...
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