From f09d0976f1e77d583b57ebf0341daef88e062a80 Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 22 Jun 2015 23:22:59 +0200 Subject: [PATCH] Update --- Nodes.xml | 4 +- Tokens.xml | 30 +-- annotated.html | 2 +- classes.html | 2 +- classnlohmann_1_1basic__json-members.html | 4 +- classnlohmann_1_1basic__json.html | 18 +- classnlohmann_1_1basic__json.js | 2 +- ...asic__json_1_1const__iterator-members.html | 2 +- ...ann_1_1basic__json_1_1const__iterator.html | 2 +- ...tor_a019087161350d393f3e4ac841cdd3dbd.html | 2 +- ...tor_a17e5f5d3598e6901f3c1c1f7dc60589f.html | 2 +- ...tor_a1cba94e5a67ee52bc66b898a4e08359d.html | 2 +- ...tor_a301749e9779adafd395369ac36df93df.html | 2 +- ...tor_a3555206044cce80680f3ea662760e561.html | 2 +- ...tor_a36086a699b95e06976c11367b7d6ba53.html | 2 +- ...tor_a4632d8307fc315f21e2ecc9ba5aa6346.html | 2 +- ...tor_a4f7ac43b0ab34c387b1ae1a8e9c08467.html | 2 +- ...tor_a62cad59e006eb7fa594c2c5b65a76610.html | 2 +- ...tor_a67848d4b7bfa576434ad9807147b5870.html | 2 +- ...tor_a6b3e43d2f45fa611825dbdf4e88fffe2.html | 2 +- ...tor_a86a1771e6658d0b14868df6c197d2353.html | 2 +- ...tor_a8d024cbc99db0d8106899f9fd9973735.html | 2 +- ...tor_aa30f18484c63166246f8eec30a7984bc.html | 2 +- ...tor_aaf7158f62951acb046b867316be0fb97.html | 2 +- ...tor_ab74b39747a9dad60650a57133fca85b3.html | 2 +- ...tor_ab7dacd8e3ee9b3756bfcdb87dd55a515.html | 2 +- ...tor_ab9d31bf0d0b4d7310c858a04ce84a52f.html | 2 +- ...tor_abb1921cbf0ad4036c83bc6303e22171f.html | 2 +- ...tor_abbacd95955c602efc9a58ed1ffdb46c4.html | 2 +- ...tor_ac36b9187de43721a4bf1b052578bb80b.html | 2 +- ...tor_ac634a659837f5aebc97125e031de23b5.html | 2 +- ...tor_acea5b75d1087e2a92833946d9dc547ff.html | 2 +- ...tor_ada3100cdb8700566051828f1355fa745.html | 2 +- ...tor_adb50d6043ace464d9f694869724d7fb2.html | 2 +- ...tor_adda9a4bd7f0edb9cb39dc0dca3d4a286.html | 2 +- ...tor_adf6f9d3f8f8d8b1ccedabb4f04c098ad.html | 2 +- ...tor_ae480d5c86e5e1129d53d1e19782017a6.html | 2 +- ...tor_aebd099d9a70ffe760242ef24046c9002.html | 2 +- ...tor_af34f68f1ce670e7f25ce267b2b1e64ab.html | 2 +- ...tor_af55564e391b23e41abe78bc4bbe4edcb.html | 2 +- ...n_1_1const__reverse__iterator-members.html | 2 +- ...sic__json_1_1const__reverse__iterator.html | 2 +- ...tor_a31fc105e72c0e8b19eda11495fd3af3f.html | 2 +- ...tor_a7eb11a5029b7ffff32fdea5f082493c2.html | 2 +- ...tor_a8ba3f75a7ec557eec19b7513e2924219.html | 2 +- ...nn_1_1basic__json_1_1iterator-members.html | 2 +- classnlohmann_1_1basic__json_1_1iterator.html | 2 +- ...tor_a037e5f3de196ff4cea8a95a8a4e35882.html | 2 +- ...tor_a0a43bd93e6e46645ed0b93d3af7bfe22.html | 2 +- ...tor_a0c0acb68cc2a50a0e8782f860184883f.html | 2 +- ...tor_a1220b360a07b0605f7d2f4b3cfd16736.html | 2 +- ...tor_a21d32a4547ba4cbadd8b435a6a0d0e1b.html | 2 +- ...tor_a302d810a0685f8d39368eaa65c833acf.html | 2 +- ...tor_a33277dbf06ac5c1e7102e26f6b5e2c00.html | 2 +- ...tor_a46bae6328cd653d64b4569b1c8e63d58.html | 2 +- ...tor_a4ae612fa9eb59784047b40f0419db65d.html | 2 +- ...tor_a4f6e03ae3bb674ebf0b727f74957c12f.html | 2 +- ...tor_a545c6a8a714e4ab23a28e73d45ad068c.html | 2 +- ...tor_a7031e759ee52d1283aada0ff81108a5e.html | 2 +- ...tor_a7286981657d115cc8803d14b28874ab3.html | 2 +- ...tor_a75d68bfd97f26133dbeebb4fb49379fd.html | 2 +- ...tor_a799627115ae852c4bb9ca2042ce0aa94.html | 2 +- ...tor_a83b095887d17e0351f8be616764ac455.html | 2 +- ...tor_a903462b9290e1bde30716f9e14d9d3df.html | 2 +- ...tor_a94285e2ade0bfef829b81377bbbca6cf.html | 2 +- ...tor_a9fcfda575b08d0c73b6274cdbbe7f184.html | 2 +- ...tor_aa2bd10afdcfc70acb8eaabbd2f6496f0.html | 2 +- ...tor_ab220a0cc3fe410fbae4524208bd5834f.html | 2 +- ...tor_ab5cf753cb2f8ce53b9f3e54c39e50ee3.html | 2 +- ...tor_ac01e258f97612d7f7766f92324e5612a.html | 2 +- ...tor_ac17f1d9d40b6b928a4964ce97a443c6e.html | 2 +- ...tor_acf3df244524244ed5c2923c11427e3da.html | 2 +- ...tor_ad35cf47e2fb5918dc06260eda3dcd35d.html | 2 +- ...tor_ad58453e21f157edfeaaff13e9560724b.html | 2 +- ...tor_ada3100cdb8700566051828f1355fa745.html | 2 +- ...tor_ae58eb251e2ca9b5c9d522f25fa67eb36.html | 2 +- ...tor_afe65b5a0572c7bfdd7ccc942bb8e9fe2.html | 2 +- ...ic__json_1_1reverse__iterator-members.html | 2 +- ...n_1_1basic__json_1_1reverse__iterator.html | 2 +- ...tor_a514d7a82f1c8f1862acfefe8d16c6ca6.html | 2 +- ...tor_ae711bdc24d54870a560550fc21c11f46.html | 2 +- ...tor_af3029b8b16518b9da0b4cd3be98ef2c1.html | 2 +- ...son_a01a2643289b69cd71d9b3f3fc209b748.html | 2 +- ...son_a034bccea9f5400650443e9f12e67b079.html | 48 +++- ...son_a058be74840ddfec9dad9755ac8dc8b99.html | 4 +- ...son_a0998ed4a76d1e5048fd043475eb7bfde.html | 4 +- ...son_a0a7560122349628cf4942a316aa6d21f.html | 2 +- ...son_a0a9c6a1fccc4db365860463e8203eb38.html | 2 +- ...son_a0bb6ea56c89560cce8003485bffe49d4.html | 4 +- ...son_a0e372f4c5a90c6be7242a2d7a3709b48.html | 2 +- ...son_a122640e7e2db1814fc7bbb3c122ec76e.html | 4 +- ...son_a13e5642dbfa1602c937d295a085413cc.html | 2 +- ...son_a15e468968cd4d0e4fd566044d66ada24.html | 2 +- ...son_a16a275d0201e9aedc87c933c764b8869.html | 2 +- ...son_a190d719446e7016879c4b961c9cf9072.html | 22 +- ...son_a1f6b988271c56e3b9d5d33166154fdb6.html | 4 +- ...son_a231b02148577b69a154b2ce2c87a5522.html | 2 +- ...son_a2448b2777e8a3e48614e1b3c41b96f7c.html | 2 +- ...son_a266c4dd24d11a86e4831523af5d9df4d.html | 2 +- ...son_a2759c64550285b6316fe76d76460d32e.html | 6 +- ...son_a2bb1b109282149119a070be4ac76f820.html | 4 +- ...son_a2de337cd1d53060b4b8c4118cddc6333.html | 17 +- ...son_a31af4b416e9ccb373291a645da7f83d7.html | 2 +- ...son_a33f1632cfdbf460b4913f4e8a43dd9e4.html | 2 +- ...son_a34d6a60dd99e9f33b8273a1c8db5669b.html | 4 +- ...son_a3e49eea90db1cba32ee86a7644a7f05b.html | 6 +- ...son_a429c2606865483ff357cccc1b1c46569.html | 2 +- ...son_a444d8376d63d7a5edb85f33bc5976c14.html | 4 +- ...son_a46f149c14e807916a90037557ccfcffa.html | 2 +- ...son_a4be3b72fd7f949a0695d08300a258a06.html | 2 +- ...son_a4bf695ddf4a00ea8feea2c725ec847f1.html | 2 +- ...son_a53590b99e380c464a83a0a5edf6da9ab.html | 4 +- ...son_a572cdf681c75b42c2bc38a1fbe993eca.html | 4 +- ...son_a57703688bee6b9736ab3a430d8d246f2.html | 2 +- ...son_a57a96ab3ff1ce7b48a754129fb12c982.html | 2 +- ...son_a5a2d4dbcdbc8ea065b87daf52cd786b9.html | 2 +- ...son_a5c8bb5200f5eac10d31e26be46e5b1ac.html | 4 +- ...son_a5e34c5435e557d0bf666bd7311211405.html | 4 +- ...son_a5fd8b54389698edf0c08e2dd001f610b.html | 2 +- ...son_a60ca396028b8d9714c6e10efbf475af6.html | 57 ++++- ...son_a62136b62f0ec60c0f2b5a3ce9aaa19b4.html | 4 +- ...son_a63691315292df8e1522b00d37ebb1ffc.html | 2 +- ...son_a652414dd930cb3af3b6f454cc535a23e.html | 2 +- ...son_a677297e84beb0f13cbd55525cf523e01.html | 6 +- ...son_a6944904b3b59769b1cf62ac2532cbe33.html | 2 +- ...son_a6a67c72ba65322bfcb28d170617dcdff.html | 2 +- ...son_a6a7f45095675ac6fd1d018a0e41874be.html | 209 ++++++++++++++++++ ...son_a6bbd3e72a870f1ba81ff6886b063b0fe.html | 2 +- ...son_a6dff6a02a2be250b8f8dc2f47be65544.html | 2 +- ...son_a6e2e21da48f5d9471716cd868a068327.html | 4 +- ...son_a70be72c27e1ca0af77335585a8cec1ed.html | 2 +- ...son_a749e58042d8069f4f048ee4d23c43f63.html | 2 +- ...son_a74a943800c7f103d0990d7eef82c6453.html | 4 +- ...son_a74ccfa471a0c061876b247f820f3c741.html | 13 +- ...son_a793e5c1da2fc7de7a04b19eadbb3f2cb.html | 2 +- ...son_a7c19a5c3be6cc755377ee41eade78baf.html | 2 +- ...son_a7d0db3b728d820d4984df78d97d2b104.html | 2 +- ...son_a7d1b990f2c12fecb57db1504fdadd0bb.html | 2 +- ...son_a7dab69b10b98e7bc694339720e37fb2b.html | 2 +- ...son_a80a89ddbe4cb7ef15b049febee208cc8.html | 4 +- ...son_a80ceaa3bdd346292273b309e08525c1c.html | 2 +- ...son_a83cbbfbf5d3ecbad6de8ece0be6b36c4.html | 6 +- ...son_a87698fe3ae2652b3ad5eab1b717fee5f.html | 2 +- ...son_a879007de260e6a128fbbce4e78c804af.html | 6 +- ...son_a87db51b6b936fb2ea293cdbc8702dcb8.html | 4 +- ...son_a8b526709d395142b68d21abfbfff17c3.html | 6 +- ...son_a8c40cd9ead4de7c82f28268bdf0ec98a.html | 4 +- ...son_a8e34088252a3ee6b2377f3a1f26dd1ba.html | 2 +- ...son_a930e14150ffa067bcf56d35cb00271e1.html | 2 +- ...son_a951a76ba057b3be948e7ba5c2c01cd5a.html | 2 +- ...son_a9a91e05cbc516623fa61e253f920e42e.html | 2 +- ...son_a9daafb4c15ed5a008cb825bbd8c29d87.html | 2 +- ...son_aa1f3b3f1dca79392d6727b81f9668c6c.html | 4 +- ...son_aa23ac5808b9aa1a08d18e3ebea25c7ce.html | 2 +- ...son_aa366948498c70661eac025a841507db9.html | 6 +- ...son_aa5a06ef7009d3a8c72cc173f1f5da760.html | 4 +- ...son_aa70eb86b6e6ada371d95adb7d171c2af.html | 6 +- ...son_aa71e977d31f470689883ac60d16ea4ac.html | 2 +- ...son_aa87c30bfeaa395f12bb101934395a637.html | 2 +- ...son_aac185a137428a7337aa620de07bfbbd7.html | 2 +- ...son_aacd442b66140c764c594ac8ad7dfd5b3.html | 4 +- ...son_aacf6c869f6a9c66ac1bc99e93f310044.html | 2 +- ...son_aaf363408931d76472ded14017e59c9e8.html | 57 ++++- ...son_aafa839f2a74dc1b5060314b3423143b8.html | 2 +- ...son_ab8682827348d8eb61507bbe8c7829ce8.html | 4 +- ...son_ab9da2afc6f77295f25252725fde142a6.html | 4 +- ...son_abb086fd840bedb05e0aee67f70eba1a9.html | 4 +- ...son_abc2b49c2c44c61a15d4b272a85b41064.html | 4 +- ...son_ac4011bd0781e51afe4994d2b09fd27e9.html | 2 +- ...son_ac82abedf356d252e0589850c3d8b35ba.html | 2 +- ...son_ac943391891fcde0a71a15ce990e0f7f4.html | 2 +- ...son_acbf7f957ecb6ce19cdc5b40b5d6b6333.html | 26 +-- ...son_ace5106fb70f029fd7dfe99fc9eace3b5.html | 6 +- ...son_ace8338e57fdb11e1955c2a0c2d782069.html | 2 +- ...son_ad1fea64ed433a6f4e7408c8c7bbc4a37.html | 2 +- ...son_ad2c4513cef5d8db760c4b2d871eea42c.html | 2 +- ...son_ad62e88e5c60e03e094e6250f6bb2f9cf.html | 6 +- ...son_ad7067a1a8ad2d88125915ada6d4d79b7.html | 2 +- ...son_ad7b898eb39e6e6c1cc870dde1f9517f0.html | 6 +- ...son_ad81f3cedf09ccd70b2f3239d148c8752.html | 2 +- ...son_ad8f84e6fb9bbf9a7bc767962ad0fe3a1.html | 6 +- ...son_ada8e01109a60088e4db2a670d4903b54.html | 2 +- ...son_adb71e93d99ec4fc0df16d74ab30c02a1.html | 2 +- ...son_adbd4c16c9ac641b2a4736bc2c6787d83.html | 2 +- ...son_add77b50f69debb20e98d5a8c6c11c90c.html | 4 +- ...son_ae2980ed978451f844e6e9a0890b637a6.html | 29 ++- ...son_ae42d32c34c8014b1bf677fdb7baa5401.html | 42 +++- ...son_ae5dc3be56fdd8244973c3e3790769ad0.html | 6 +- ...son_ae928414b2805cf6ef56b4e4f8d235416.html | 2 +- ...son_ae960d2d6bc7b94fe39cc5e9f106edfa9.html | 2 +- ...son_aea1c863b719b4ca5b77188c171bbfafe.html | 2 +- ...son_aeda4ec7473c17fae51e6d1eba0faf720.html | 2 +- ...son_af2730bc8ffa6b28916875c13ee7b83f5.html | 13 +- ...son_af3abeeb0e9676de8bc2d6aa6f6c0d6c6.html | 2 +- ...son_af4261341695729a8e657b94772f95516.html | 8 +- ...son_af49c37bbda87f36170c67f960db3781a.html | 4 +- ...son_af6b6050ccd906dddf7c9f47fe3ad62a5.html | 2 +- ...son_af70222eb312ca0a44cd7d793b1516e2e.html | 4 +- ...son_af74581d177dafc38df5a126ccd358999.html | 2 +- ...son_af93e556bf708cb81b22ce223af1aa727.html | 2 +- ...son_afb19d4669daf3c4347763f043471b835.html | 2 +- ...son_afb9664e6f30038e691f2e864e7f6a740.html | 4 +- dir_68267d1309a1af8e8297ef4c3efbcdba.html | 2 +- functions.html | 2 +- functions_a.html | 2 +- functions_b.html | 2 +- functions_c.html | 2 +- functions_d.html | 2 +- functions_e.html | 2 +- functions_enum.html | 2 +- functions_f.html | 2 +- functions_func.html | 2 +- functions_g.html | 2 +- functions_i.html | 2 +- functions_j.html | 2 +- functions_k.html | 2 +- functions_l.html | 2 +- functions_m.html | 2 +- functions_n.html | 2 +- functions_o.html | 2 +- functions_p.html | 2 +- functions_r.html | 2 +- functions_rela.html | 2 +- functions_s.html | 2 +- functions_t.html | 2 +- functions_type.html | 2 +- functions_v.html | 2 +- functions_vars.html | 2 +- functions_~.html | 2 +- graph_legend.html | 2 +- hierarchy.html | 2 +- index.html | 2 +- namespacemembers.html | 2 +- namespacemembers_type.html | 2 +- namespacenlohmann.html | 2 +- ...ann_a2bfd99e845a2e5cd90aeaf1b1431f474.html | 2 +- navtreeindex0.js | 2 +- pages.html | 2 +- search/all_2.js | 2 +- search/functions_1.js | 2 +- ...ash_3_01nlohmann_1_1json_01_4-members.html | 2 +- ...std_1_1hash_3_01nlohmann_1_1json_01_4.html | 2 +- ...1_4_afd03f6ad53db22868ca4163a8200b2f9.html | 2 +- todo.html | 20 +- ...1_1basic__json_1_1json__value-members.html | 2 +- ...lohmann_1_1basic__json_1_1json__value.html | 2 +- ...lue_a10dd4f2f978cdcbb3be850dc8f3351d6.html | 2 +- ...lue_a231c96961c674bebfb14d3f50bb57703.html | 2 +- ...lue_a329c53042b9ba5c73512da4c780f2f2c.html | 2 +- ...lue_a3a2fa91f7daaca8a07963755eea1580d.html | 2 +- ...lue_a4351a2387d3eef1c1ecea5c9c8efb92d.html | 2 +- ...lue_a4ff9894ccb1eca08ba1c49eec70ee2f5.html | 2 +- ...lue_a592a4d5dfca10aa2bf033641b9ee050f.html | 2 +- ...lue_a874e1bed30eee7847d34d8f410114cbc.html | 2 +- ...lue_a9b0c0f7dc2ddb9fa9101a287b233a8b2.html | 2 +- ...lue_a9bd260b1ff2f03572dcc84c179a6a37c.html | 2 +- ...lue_ab2c1e8a4ef5293eb86e9a6c03fbb5610.html | 2 +- ...lue_ac051d54557c5cf079925b810c0e16e1e.html | 2 +- ...lue_ac6fa840d0f9cefd1f064e371a369d3bf.html | 2 +- ...lue_af432b12c2a45a123ae7404588d889af7.html | 2 +- 260 files changed, 851 insertions(+), 362 deletions(-) create mode 100644 classnlohmann_1_1basic__json_a6a7f45095675ac6fd1d018a0e41874be.html diff --git a/Nodes.xml b/Nodes.xml index 2a88264fc..4c16d7c27 100644 --- a/Nodes.xml +++ b/Nodes.xml @@ -735,8 +735,8 @@ basic_json - classnlohmann_1_1basic__json_a2de337cd1d53060b4b8c4118cddc6333.html - a2de337cd1d53060b4b8c4118cddc6333 + classnlohmann_1_1basic__json_a6a7f45095675ac6fd1d018a0e41874be.html + a6a7f45095675ac6fd1d018a0e41874be basic_json diff --git a/Tokens.xml b/Tokens.xml index d570cb473..84f7037ad 100644 --- a/Tokens.xml +++ b/Tokens.xml @@ -415,7 +415,7 @@ classnlohmann_1_1basic__json_a034bccea9f5400650443e9f12e67b079.html a034bccea9f5400650443e9f12e67b079 - create a floating-point number (implicit) + create an floating-point number (implicit) json.hpp @@ -449,8 +449,8 @@ instm nlohmann::basic_json - classnlohmann_1_1basic__json_a2de337cd1d53060b4b8c4118cddc6333.html - a2de337cd1d53060b4b8c4118cddc6333 + classnlohmann_1_1basic__json_a6a7f45095675ac6fd1d018a0e41874be.html + a6a7f45095675ac6fd1d018a0e41874be construct a JSON container given an iterator range json.hpp @@ -1401,18 +1401,6 @@ deserialize from stream json.hpp - - - operator>> - cpp - ffunc - nlohmann::basic_json - - classnlohmann_1_1basic__json_aaf363408931d76472ded14017e59c9e8.html - aaf363408931d76472ded14017e59c9e8 - deserialize from stream - json.hpp - operator<< @@ -1425,6 +1413,18 @@ deserialize from stream json.hpp + + + operator>> + cpp + ffunc + nlohmann::basic_json + + classnlohmann_1_1basic__json_aaf363408931d76472ded14017e59c9e8.html + aaf363408931d76472ded14017e59c9e8 + deserialize from stream + json.hpp + object_start diff --git a/annotated.html b/annotated.html index 8da9b8e9f..c5a2901f2 100644 --- a/annotated.html +++ b/annotated.html @@ -128,7 +128,7 @@ $(document).ready(function(){initNavTree('annotated.html','');});