j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #321 from vasild/develop

Browse source 
Fix usage examples' comments for std::multiset
This commit is contained in:
Niels Lohmann 2016-10-06 22:33:58 +02:00 committed by GitHub
commit 8173c370f6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -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

2
doc/examples/basic_json__CompatibleArrayType.cpp
View file

@ -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"};

4
test/src/unit-readme.cpp
View file

@ -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