haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
947 commits 11 branches 56 tags 222 MiB
Commit graph

169 commits

Author SHA1 Message Date
Niels 6e1347e68c fixes #270 2016-07-01 16:58:50 +02:00
Niels a73bda8147 fixed performance regression #272 2016-06-28 21:24:18 +02:00
Niels 360f0f3791 updated README and ChangeLog 2016-06-24 17:39:03 +02:00
Niels c74b9ff4f7 another fix for the MSVC version 2016-06-24 17:15:54 +02:00
Mário Feroldi 6aad67af23 fixed a tiny typo 2016-06-24 05:47:00 -03:00
Niels 0767290c26 off-by-one error in the documentation 2016-06-24 08:06:41 +02:00
Niels ca2bbdb15b clarified MSV version 2016-06-24 07:39:08 +02:00
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