mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-21 12:05:30 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,881 Commits 14 Branches 56 Tags 280 MiB
5155cc2c48
Commit Graph

512 Commits

Author SHA1 Message Date
Niels
39a9cfcc12 updated README 2016-06-23 18:08:20 +02:00
Niels
3497fab3b5 cleanup 2016-06-23 05:55:48 +02:00
Niels
7cff6c8771 Merge branch 'develop' into feature/issue269 
# Conflicts:
#	README.md
 2016-06-23 00:04:55 +02:00
Niels
6f76c9237b overworked ChangeLog and README 2016-06-22 22:20:55 +02:00
Niels
ecf84dddb1 test case for #269 2016-06-22 20:40:15 +02:00
Niels
15a314abea updated README 2016-06-19 22:38:54 +02:00
Niels
bb8c7b1f45 mentioning Homebrew's --HEAD parameter 2016-06-15 21:28:27 +02:00
Niels
1eced269e3 update after PR #266 2016-06-14 15:27:21 +02:00
Niels
c744d59f2d adjusted README file to reality in Travis 2016-06-14 08:14:25 +02:00
Niels
04e1e7b586 cleanup 2016-05-29 14:56:08 +02:00
Niels
7bdfde4493 added a note about different NDKs (see #219) 2016-05-28 16:06:41 +02:00
Niels
71a7746ccb removed a line 2016-05-25 21:55:03 +02:00
Niels
a3f432b3dd added hint to Homebrew 2016-05-18 22:23:35 +02:00
Niels
837617122a fixed #246 2016-05-18 22:17:08 +02:00
Niels
fb06356856 thanks 2016-05-11 20:58:11 +02:00
Chris Kitching
af76508fe7
Introduce structure to the test/ directory 
This introduces a clear separation between test data and test
binaries. Test data is moved into test/data, and the test binaries
move into test/src. A new CMake script specific to building the
tests is introduced in /test to slightly clean up the toplevel
one.

As well as tidying things up, this makes the next step trivial...
 2016-05-11 01:30:08 +01:00
Niels
85a30813c8 removed unnecessary code (numbers must not begin with "+") 2016-05-07 20:22:58 +02:00
Niels
c04275966f improved test coverage 2016-05-07 18:33:43 +02:00
Niels
ea84a85b13 simplified flatten/unflatten examples 2016-04-30 10:39:03 +02:00
Niels
a21f8b0c77 added AppVeyor information 2016-04-30 01:21:35 +02:00
Niels
9170740f45 added documentation on Travis compilers 2016-04-30 01:01:41 +02:00
Niels
86debab3b1 Merge branch 'develop' into feature/json-patch 2016-04-26 20:43:02 +02:00
Niels
9af8f7d094 update after #238 2016-04-26 20:38:01 +02:00
Niels
5e0bf75d60 cleanup, test, and diff 2016-04-25 23:17:04 +02:00
Niels
6268287940 improved documentation and test coverage 2016-04-17 22:08:21 +02:00
Niels
76a5a776eb cleanup after #234 2016-04-16 12:19:10 +02:00
Niels
15f8c848fa fixed typo and indentation 2016-04-10 18:23:43 +02:00
Niels
9c233be567 merged #201 2016-04-03 14:08:38 +02:00
Niels
04edafbddc Merge pull request #227 from kevin--/kevin--/noexcept_documentation 
fixes #223 by updating README.md
 2016-03-30 20:21:35 +02:00
Niels
96443b0b97 added more thanks to the README file 2016-03-30 19:47:08 +02:00
Niels
27530c7840 better notes for Android (manually closes #215) 2016-03-30 19:42:54 +02:00
Niels
888635b749 cleanup after PR #212 and PR #226 2016-03-30 19:23:11 +02:00
Kevin Dixon
3df5337e79 fixes #223 by updating README.md 2016-03-29 21:41:46 -07:00
Niels
c6a6a024f7 fixes #214 2016-03-06 20:03:05 +01:00
Niels
10a884473e fixed #217 2016-03-04 07:30:08 +01:00
Annihil
78a020354d Corrected readme 
Internally, the elements in a map are always sorted by its key following a specific strict weak ordering criterion indicated by its internal comparison object (of type Compare).
With string type, the default comparator is alphabetical order, and thus two come after three.
 2016-03-02 02:01:40 +01:00
Niels
53879f9c99 cleanup 2016-02-21 08:17:11 +01:00
Niels
153e105164 cleanup after #207 2016-02-14 18:38:29 +01:00
Niels
1cc4717582 tried Clang 3.9 2016-02-09 21:26:40 +01:00
Niels
be20555985 removed gitter 2016-02-07 17:24:51 +01:00
Niels
236b7afff5 updated and fixed online version 2016-02-07 15:07:17 +01:00
Niels
740239cef8 added a note about GCC 4.8 (#163) 2016-01-30 21:17:08 +01:00
Niels
fb239fe645 trying Gitter 2016-01-26 21:42:51 +01:00
Niels
2468631dc9 overworked examples 2016-01-26 20:07:03 +01:00
Niels
707732a53e clean up after #193 2016-01-26 19:50:49 +01:00
Niels
d338042e3e added note to warn about floating-point exceptions (#181) 2016-01-26 19:21:46 +01:00
Niels
b630ce0e78 thanks 2016-01-26 19:11:58 +01:00
Volker Diels-Grabsch
08fd6dbf98 Fix broken link 2016-01-26 15:22:15 +01:00
Niels
2b13711009 updated online version 2016-01-24 23:02:28 +01:00
Niels
54a4139157 cleanup after #191 2016-01-24 17:33:46 +01:00
Niels
dfb01c659b added more comments 2016-01-24 16:42:45 +01:00
Niels
8a0490a011 cleanup 2016-01-24 13:04:55 +01:00
Niels
600ad330c5 cleanup after PR #189 2016-01-24 11:00:54 +01:00
Niels
a04bd4f851 cleanup after #184 2016-01-20 21:14:58 +01:00
Niels
72e33eec1a thanks 2016-01-15 08:24:44 +01:00
Niels
c0bb5a56eb added note on assertions (#168) 2016-01-13 21:08:46 +01:00
Niels
57e018483a it's 2016 already... 2016-01-13 20:19:05 +01:00
Niels
9b07504e23 fix for #166 2016-01-01 18:33:58 +01:00
Niels
3905406f9c removed an unnecessary cast (fixed #162) 2015-12-29 12:30:05 +01:00
Niels
d6b8830e03 more work on exceptions (#160) 2015-12-26 13:17:32 +01:00
Niels
76e5e29eda overworked exceptions and tests (#160) 2015-12-25 11:46:18 +01:00
Niels
70493a10d1 iterator_wrapper for const objects (#83) 2015-12-23 08:21:29 +01:00
Niels
67c2d90a21 working on #160 2015-12-22 13:27:40 +01:00
Niels
457bfc2401 work on #144 2015-12-20 15:30:07 +01:00
Niels
1df5d726d9 undid the fix for #136 2015-12-15 18:34:07 +01:00
Niels
cd04a7d3e9 fix for #133 
added value() function to get object value at given key or a default
value if key does not exist
 2015-12-15 08:38:54 +01:00
Niels
2ba901bbf6 cleanup 2015-12-14 21:23:21 +01:00
Niels
a70a7a8001 fixed #135: operator[] now only works on nonconst JSON objects 2015-12-13 11:26:55 +01:00
Niels
c767f464bb dropped GCC 4.8 support (due to #110) 2015-12-08 18:12:34 +01:00
Niels
e0d334c4f1 added a comment (see #109) 2015-12-07 21:53:32 +01:00
Niels
d6771ac79d corrected a username 2015-12-07 21:50:27 +01:00
Niels
22bc022745 added change from #140 2015-12-07 21:05:21 +01:00
Niels
72476b4226 cleanup after #153 2015-12-07 20:38:16 +01:00
Niels
6f8e36ac3d fixes #136 2015-12-06 17:33:52 +01:00
Niels
746c1a7142 cleanup 2015-10-17 12:51:59 +02:00
Niels
57de1d602e Cleanup 2015-10-03 13:16:59 +02:00
Niels
bd5d96c456 minor change 2015-08-14 14:56:58 +02:00
Niels
b58a93b8dd merged #111 2015-08-14 14:45:13 +02:00
Niels
a26e44d66e prepare 1.0.0-rc1 2015-07-26 20:44:55 +02:00
Niels
359cf7993f closed #75 
minor changes, but the core idea remains the same
 2015-07-26 18:41:58 +02:00
Niels
4c31de262e cleanup 2015-07-26 10:17:51 +02:00
Niels
623c03bc49 some cleanup 2015-07-19 12:41:46 +02:00
Niels
818ae5a524 updated documentation to show off MSVC support 2015-07-16 22:37:54 +02:00
Niels
92fffaa872 cleanup 2015-07-16 19:53:42 +02:00
Niels
e007f02c54 updated readme 2015-07-14 21:24:29 +02:00
Niels
186aefb8f2 added first insert functions 2015-07-12 18:28:23 +02:00
Niels
55fe3807c9 small README fix 2015-06-29 23:20:33 +02:00
Niels
5ae2babf61 add online examples 2015-06-29 23:02:41 +02:00
Niels
f1c9aa26c4 update Travis badge 2015-06-22 21:50:24 +02:00
Niels
88445fd96b fixed doxygen badge 2015-06-21 23:07:13 +02:00
Niels
8e97e46f50 update README badges 2015-06-21 23:05:50 +02:00
Niels
e63c508172 overworked doxygen 2015-06-21 00:59:33 +02:00
Niels
0abac59291 mentioned Clang 3.7 2015-06-20 17:45:59 +02:00
Niels
1375162562 exclude Unicode tests from Valgrind to avoid timeout 2015-06-15 05:46:12 +02:00
Niels
2e9a13bd88 added extensive Unicode tests 2015-06-14 23:17:49 +02:00
Niels
bab7e9667f added badge for license 2015-06-11 18:08:00 +02:00
Niels
2d26d85c2b some cleanup 2015-06-08 16:35:38 +02:00
Niels
afc7f2388e fixed typo (#74) 2015-06-02 21:24:03 +02:00
AQNOUCH Mohammed
7da56cf292 Fix typos 2015-05-12 14:59:44 +01:00
Niels
abb8653115 more test cases 2015-05-09 16:58:06 +02:00
Niels
165d367493 updated README 2015-05-09 15:30:17 +02:00
Niels
bb142d6cae added test cases 2015-05-09 14:37:22 +02:00
Niels
17609f244d fixed #70 2015-05-06 19:52:12 +02:00
Niels
952cbbc795 manually merged pull request #41 2015-05-03 17:52:13 +02:00
Niels
f09df96742 updated README 2015-04-26 15:16:07 +02:00
Niels
28f21c43f4 updated README to recent pull request 2015-04-15 17:52:25 +02:00
Niels
a3210ee2a9 increase test coverage 2015-04-11 15:42:54 +02:00
Niels
d7d0509161 added a note about supported compilers to close #50 2015-04-09 19:21:24 +02:00
Niels
9e8e11339d improved test case coverage 2015-04-08 22:58:35 +02:00
Niels
3eb50dde30 added RTD badge 2015-03-31 22:41:51 +02:00
Niels
e0027a8550 cleanup docs 2015-03-31 22:40:21 +02:00
Niels
f9c4b02092 rename to check something with RTD 2015-03-31 22:39:16 +02:00
Niels
c9379b68dd fix #52 (documented new functions) 2015-03-27 17:11:08 +01:00
Niels
8fc4061187 fixed acknowledgements 2015-03-24 19:06:40 +01:00
Niels
0707030bc5 minor changes to pull request #40 2015-03-24 18:05:58 +01:00
Niels
8e1c5f2221 updated README 2015-03-23 20:30:51 +01:00
Niels
93b585afa4 added GIF 2015-02-22 17:55:25 +01:00
Niels
d524e23204 overworked iterators 2015-02-22 17:52:27 +01:00
Niels
bc2e3a798d a more forgiving array behavior 2015-02-21 13:24:07 +01:00
Niels
1cd256a95e minor syntax error in README 2015-02-19 00:06:15 +01:00
Niels
afd02eee44 fixed [] operator; added README 2015-02-18 22:28:56 +01:00
Niels
befd90dead cleanup 2015-01-31 20:13:11 +01:00
Niels
b453cdb7a2 more examples 2015-01-24 21:11:42 +01:00
Niels
85aa0a328e updated README 2015-01-24 21:06:05 +01:00
Niels
c22ee3f296 fixed an issue with non portability 2015-01-21 18:04:12 +01:00
Niels
76be1ae1f6 + more adjustments toward a real container 2015-01-21 11:47:03 +01:00
Niels
54fc97d434 + set number type to int64_t 
+ replaced several functions by template magic
 2015-01-20 20:43:54 +01:00
Niels
7724d34741 fixed #31: only use spaces in pretty print 2015-01-18 10:58:48 +01:00
Niels
d47b0e749b updated README 2015-01-12 23:38:55 +01:00
Raphael Isemann
85888e8205 Added a remark to the readme that coverage is GCC only for now 2015-01-10 18:09:46 +01:00
Niels
3fa2e900ef + added Thanks section to README 2015-01-09 20:48:06 +01:00
Niels
52f399d55f created a header-only version (see issue #16) 2015-01-09 18:16:27 +01:00
Niels
2443aa6521 updated README 2015-01-09 17:50:50 +01:00
Niels
bd9f49efb9 implemented pretty printing (issue #13) 
- to_string() method is now called dump()
- syntax borrowed from Python’s json.dumps()
 2015-01-06 21:44:07 +01:00
Niels
08456b8ff0 minor changes 2015-01-06 19:14:03 +01:00
Niels
a53c878c81 moved class into "nlohmann" namespace 
- fixed issue #9
- also removed std::mutex member variable
- also added “std::” prefix to size_t variables
 2015-01-06 18:41:24 +01:00
Niels
4f0afbbe64 added note from http://isocpp.org/blog/2015/01/json-for-modern-cpp 2015-01-05 22:25:44 +01:00
Niels
bf768d96d9 minor Markdown error 2015-01-05 20:30:34 +01:00
Raphael Isemann
67459fcd83 Added CMake to the README 2015-01-05 11:29:41 +01:00
Niels
3bef1a5097 renamed "toString()" to "to_string()" 2015-01-04 20:50:28 +01:00
Niels
f63ff7727e renamed class from "JSON" to "son" 2015-01-04 20:43:25 +01:00
Niels
4d00105e5c tidy up 2015-01-04 19:05:46 +01:00
Niels
0019c85b85 fix 2015-01-04 18:55:15 +01:00
Niels
aa166a4739 updated examples 2015-01-04 18:52:04 +01:00
Niels
77ea63ceb5 fixed a link 2015-01-04 18:32:03 +01:00
Niels
4ea98517f5 updated README 2015-01-04 13:20:32 +01:00
Niels
6995d33fb1 + fixed documentation bugs 2014-12-30 11:57:58 +01:00
Niels
39cf26e2db minor changes 2014-12-30 11:29:59 +01:00
Niels
2be4f24837 + updated reference 2014-12-30 11:19:35 +01:00
Niels
15a9d3cff6 minor changes 2014-12-29 19:54:31 +01:00
Niels
0b8dda1e0c minor changes 2014-12-29 18:32:17 +01:00
Niels
515d731fd4 + documentation 2014-12-29 13:35:52 +01:00
Niels
3985226f76 issue badge 2014-12-28 23:21:46 +01:00
Niels
30ac86a0fe + updated README 2014-12-28 11:06:01 +01:00
Niels
db804169c7 added coverage badge 2014-12-28 09:29:33 +01:00
Niels
fbad7fac17 2.0 preview 2014-12-28 09:11:01 +01:00
Niels
d47a81296f fixed a typo 2013-12-11 08:49:07 +01:00
Niels
9a567d9d2d - tidied code 
- added more documentation
 2013-07-11 14:19:11 +02:00
Niels
ec6e628d4f - minor tweaks 2013-07-05 16:45:17 +02:00
Niels
cb2da141ec - further adjustments 2013-07-05 16:15:29 +02:00
Niels
6abf140b2b - updated README 2013-07-05 14:57:03 +02:00
Niels
d5c56f2771 - a README 2013-07-05 14:44:45 +02:00