Merge branch 'feature/insert' into develop

nlohmann · Apr 22, 2017 · 4b316ec · 4b316ec
2 parents 42b4cdd + 9b32f72
commit 4b316ec
Show file tree

Hide file tree

Showing 227 changed files with 387 additions and 234 deletions.
diff --git a/doc/examples/README.cpp b/doc/examples/README.cpp
@@ -1,4 +1,5 @@
-#include <json.hpp>
+#include "json.hpp"
+#include <iomanip> // for std::setw
 
 using json = nlohmann::json;
 
@@ -29,7 +30,8 @@ int main()
     j["new"]["key"]["value"] = {"another", "list"};
 
     // count elements
-    j["size"] = j.size();
+    auto s = j.size();
+    j["size"] = s;
 
     // pretty print with indent of 4 spaces
     std::cout << std::setw(4) << j << '\n';

diff --git a/doc/examples/README.link b/doc/examples/README.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/nv9fOg0XVVhWmFFy"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/Mi7u49cYwMR0cgTH"><b>online</b></a>
diff --git a/doc/examples/README.output b/doc/examples/README.output
@@ -23,5 +23,5 @@
         "value": 42.99
     },
     "pi": 3.141,
-    "size": 9
+    "size": 8
 }
diff --git a/doc/examples/array.cpp b/doc/examples/array.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/array.link b/doc/examples/array.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/1fsm4gI55p83DOwU"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/dREyaxnVNgG1CAUx"><b>online</b></a>
diff --git a/doc/examples/at__object_t_key_type.cpp b/doc/examples/at__object_t_key_type.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/at__object_t_key_type.link b/doc/examples/at__object_t_key_type.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/8ldtT0NOhidn0fOA"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/rCEcfTCRY40LDvoR"><b>online</b></a>
diff --git a/doc/examples/at__object_t_key_type.test b/doc/examples/at__object_t_key_type.test
diff --git a/doc/examples/at__object_t_key_type_const.cpp b/doc/examples/at__object_t_key_type_const.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/at__object_t_key_type_const.link b/doc/examples/at__object_t_key_type_const.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/nfmFWMaJJHFJ7eVK"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/SIuocSXktJ2lxj0q"><b>online</b></a>
diff --git a/doc/examples/at__size_type.cpp b/doc/examples/at__size_type.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/at__size_type.link b/doc/examples/at__size_type.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/8UnQY256zGX2Lx6d"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/wB9tQWAyqeajJTVn"><b>online</b></a>
diff --git a/doc/examples/at__size_type_const.cpp b/doc/examples/at__size_type_const.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/at__size_type_const.link b/doc/examples/at__size_type_const.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/U1fv6LY7xZOAuSBs"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/s5MsN3WV6zsGcWY4"><b>online</b></a>
diff --git a/doc/examples/at_json_pointer.cpp b/doc/examples/at_json_pointer.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/at_json_pointer.link b/doc/examples/at_json_pointer.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/Fy2xBfZMols2DUQC"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/SXcTwaW8DVzDT34z"><b>online</b></a>
diff --git a/doc/examples/at_json_pointer_const.cpp b/doc/examples/at_json_pointer_const.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/at_json_pointer_const.link b/doc/examples/at_json_pointer_const.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/WxhV3mL9YX8FJonk"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/zOTLPM0c5dNFZhk3"><b>online</b></a>
diff --git a/doc/examples/back.cpp b/doc/examples/back.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/back.link b/doc/examples/back.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/CAv4NNr4D1FJhhUv"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/Sco4kIFMzpkYo37h"><b>online</b></a>
diff --git a/doc/examples/basic_json__CompatibleType.cpp b/doc/examples/basic_json__CompatibleType.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 #include <deque>
 #include <list>
 #include <forward_list>

diff --git a/doc/examples/basic_json__CompatibleType.link b/doc/examples/basic_json__CompatibleType.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/VM7W2kpE7sIYJ5DW"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/n2KT4Yk3mzZXKnS5"><b>online</b></a>
diff --git a/doc/examples/basic_json__InputIt_InputIt.cpp b/doc/examples/basic_json__InputIt_InputIt.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__InputIt_InputIt.link b/doc/examples/basic_json__InputIt_InputIt.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/oUU2X0pbZq7gawRB"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/gsHOHaLe3MfVhI2s"><b>online</b></a>
diff --git a/doc/examples/basic_json__basic_json.cpp b/doc/examples/basic_json__basic_json.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__basic_json.link b/doc/examples/basic_json__basic_json.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/6Qfn12BDzb3vqO5p"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/zUmWzPFVFx6sEojX"><b>online</b></a>
diff --git a/doc/examples/basic_json__copyassignment.cpp b/doc/examples/basic_json__copyassignment.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__copyassignment.link b/doc/examples/basic_json__copyassignment.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/iWYvmlA4qQmtvACX"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/1BjO38rdSmNGxpyn"><b>online</b></a>
diff --git a/doc/examples/basic_json__list_init_t.cpp b/doc/examples/basic_json__list_init_t.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__list_init_t.link b/doc/examples/basic_json__list_init_t.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/iZzzxEpB7tbhz0cx"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/H0DDK6yuoCGZuoFw"><b>online</b></a>
diff --git a/doc/examples/basic_json__moveconstructor.cpp b/doc/examples/basic_json__moveconstructor.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__moveconstructor.link b/doc/examples/basic_json__moveconstructor.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/CaDlatv1uXhQiu7o"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/nXd0SKQaR6tHukvy"><b>online</b></a>
diff --git a/doc/examples/basic_json__nullptr_t.cpp b/doc/examples/basic_json__nullptr_t.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__nullptr_t.link b/doc/examples/basic_json__nullptr_t.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/9Tvfs2dJBW8m8ihA"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/AbLqRqEEN5N9W1Fj"><b>online</b></a>
diff --git a/doc/examples/basic_json__size_type_basic_json.cpp b/doc/examples/basic_json__size_type_basic_json.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__size_type_basic_json.link b/doc/examples/basic_json__size_type_basic_json.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/IFZT4VL0oRotJBxl"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/ecx4xZQX7VXuhlAz"><b>online</b></a>
diff --git a/doc/examples/basic_json__value.cpp b/doc/examples/basic_json__value.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__value.link b/doc/examples/basic_json__value.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/qdV5W2Lrljmjv4LG"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/bP03yg3IIbhARy2F"><b>online</b></a>
diff --git a/doc/examples/basic_json__value_ptr.cpp b/doc/examples/basic_json__value_ptr.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__value_ptr.link b/doc/examples/basic_json__value_ptr.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/K4L4D6nibuGXbjfd"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/OY0l4CpfWuDJudyo"><b>online</b></a>
diff --git a/doc/examples/basic_json__value_t.cpp b/doc/examples/basic_json__value_t.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/basic_json__value_t.link b/doc/examples/basic_json__value_t.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/RMpEI2o935KgD2o2"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/zRdz49DwtK0gIJuc"><b>online</b></a>
diff --git a/doc/examples/begin.cpp b/doc/examples/begin.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/begin.link b/doc/examples/begin.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/0lW1WJ1ZP8g92Jp9"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/Q0QcnX1LAQT5k7IU"><b>online</b></a>
diff --git a/doc/examples/cbegin.cpp b/doc/examples/cbegin.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/cbegin.link b/doc/examples/cbegin.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/yarD6DyxYlIf8Ymg"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/ukuefRRIclE7D7IX"><b>online</b></a>
diff --git a/doc/examples/cend.cpp b/doc/examples/cend.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/cend.link b/doc/examples/cend.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/9oPbpnFNgKtKjB0O"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/nHLMXLRwA3QWSnsQ"><b>online</b></a>
diff --git a/doc/examples/clear.cpp b/doc/examples/clear.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/clear.link b/doc/examples/clear.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/wwsjMZP8U6bWhUil"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/WQS4WbZC6pX4qZE4"><b>online</b></a>
diff --git a/doc/examples/count.cpp b/doc/examples/count.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/count.link b/doc/examples/count.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/yv5TMrq9qREivvHf"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/mrJDlTQD3orHnAdF"><b>online</b></a>
diff --git a/doc/examples/crbegin.cpp b/doc/examples/crbegin.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/crbegin.link b/doc/examples/crbegin.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/GQz9A5y7HduQHVMw"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/XsC14rus4L6meQTg"><b>online</b></a>
diff --git a/doc/examples/crend.cpp b/doc/examples/crend.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/crend.link b/doc/examples/crend.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/Qom888gs2RM4wR4H"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/jr4aG41Zr1pWUlAw"><b>online</b></a>
diff --git a/doc/examples/diff.cpp b/doc/examples/diff.cpp
@@ -1,4 +1,5 @@
-#include <json.hpp>
+#include "json.hpp"
+#include <iomanip> // for std::setw
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/diff.link b/doc/examples/diff.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/hicmeOK39tBxaluM"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/KKfCy1yctyq7PBI1"><b>online</b></a>
diff --git a/doc/examples/dump.cpp b/doc/examples/dump.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/dump.link b/doc/examples/dump.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/rjYfsEq7v1RCHprk"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/jC8OLyTjE6EOcMZt"><b>online</b></a>
diff --git a/doc/examples/emplace.cpp b/doc/examples/emplace.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/emplace.link b/doc/examples/emplace.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/B6ILaoysGMliouEO"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/mvy0nMn3uStrP9tS"><b>online</b></a>
diff --git a/doc/examples/emplace_back.cpp b/doc/examples/emplace_back.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/emplace_back.link b/doc/examples/emplace_back.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/jdch45YEMX94DvlH"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/wvLvTvPt0dovixFE"><b>online</b></a>
diff --git a/doc/examples/empty.cpp b/doc/examples/empty.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/empty.link b/doc/examples/empty.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/rP64u8KqUJqB9lFd"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/g1mZBQAdSJE3cNCH"><b>online</b></a>
diff --git a/doc/examples/end.cpp b/doc/examples/end.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/end.link b/doc/examples/end.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/4Fbmy4IG012HmGKs"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/vp0L5nlCJewdlolt"><b>online</b></a>
diff --git a/doc/examples/erase__IteratorType.cpp b/doc/examples/erase__IteratorType.cpp
@@ -1,4 +1,4 @@
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::json;
 

diff --git a/doc/examples/erase__IteratorType.link b/doc/examples/erase__IteratorType.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/W83LsQNBy5qCoABq"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/N0oo892iXEqaUzej"><b>online</b></a>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<a target="_blank" href="http://melpon.org/wandbox/permlink/nv9fOg0XVVhWmFFy"><b>online</b></a>
		<a target="_blank" href="https://wandbox.org/permlink/Mi7u49cYwMR0cgTH"><b>online</b></a>