Commit Graph

  • 52f399d55f created a header-only version (see issue #16) Niels 2015-01-09 18:16:27 +01:00
  • 2443aa6521 updated README Niels 2015-01-09 17:50:50 +01:00
  • 33f5236687 added missing header Niels 2015-01-09 17:40:14 +01:00
  • 535aef5ad0 Merge pull request #19 from kirkshoop/stditerator Niels 2015-01-09 17:37:42 +01:00
  • 33f5e74905 minor syntax adjustments Niels 2015-01-09 16:38:34 +01:00
  • 3486a5d9bb add the std iterator typedefs to iterator and const_iterator Kirk Shoop 2015-01-09 07:33:28 -08:00
  • 661a44d156 Merge pull request #18 from Teemperor/fix_quote_escaping Niels 2015-01-09 16:32:39 +01:00
  • 4a39bfb17e Fixed typo in comments Raphael Isemann 2015-01-09 11:57:39 +01:00
  • fa0ee9c927 Fixed escaped quotes Raphael Isemann 2015-01-08 22:35:48 +01:00
  • 4647401030 fixed #15 Niels 2015-01-06 22:05:32 +01:00
  • bd9f49efb9 implemented pretty printing (issue #13) Niels 2015-01-06 21:44:07 +01:00
  • 08456b8ff0 minor changes Niels 2015-01-06 19:14:03 +01:00
  • d84f8ebb02 valgrind parameter is not understood in travis Niels 2015-01-06 18:57:44 +01:00
  • 43a85be471 travis now checks with valgrind Niels 2015-01-06 18:52:14 +01:00
  • 5f05d02c6a Merge pull request #14 from elliotgoodrich/master Niels 2015-01-06 18:43:21 +01:00
  • a53c878c81 moved class into "nlohmann" namespace Niels 2015-01-06 18:41:24 +01:00
  • 0773f40a8e Fix double delete on std::bad_alloc exception Elliot Goodrich 2015-01-06 09:12:55 +00:00
  • 4f0afbbe64 added note from http://isocpp.org/blog/2015/01/json-for-modern-cpp Niels 2015-01-05 22:25:44 +01:00
  • f0582a8b60 ignore some CMake files Niels 2015-01-05 20:36:31 +01:00
  • bf768d96d9 minor Markdown error Niels 2015-01-05 20:30:34 +01:00
  • b39f78924a Merge pull request #6 from Teemperor/master Niels 2015-01-05 20:28:56 +01:00
  • 67459fcd83 Added CMake to the README Raphael Isemann 2015-01-05 11:29:41 +01:00
  • bd4e0e4fee Merge branch 'master' of github.com:nlohmann/json Raphael Isemann 2015-01-05 11:20:32 +01:00
  • 0f371b4086 CMake and coverage report Raphael Isemann 2015-01-05 11:19:42 +01:00
  • a9669a410d removed "noexpect" from all functions that use new Niels 2015-01-04 23:18:24 +01:00
  • 540cda6118 used _-suffix for member variables Niels 2015-01-04 23:09:30 +01:00
  • 3bef1a5097 renamed "toString()" to "to_string()" Niels 2015-01-04 20:50:28 +01:00
  • f63ff7727e renamed class from "JSON" to "son" Niels 2015-01-04 20:43:25 +01:00
  • 4d00105e5c tidy up Niels 2015-01-04 19:05:46 +01:00
  • 0019c85b85 fix Niels 2015-01-04 18:55:15 +01:00
  • aa166a4739 updated examples Niels 2015-01-04 18:52:04 +01:00
  • 77ea63ceb5 fixed a link Niels 2015-01-04 18:32:03 +01:00
  • 4ea98517f5 updated README Niels 2015-01-04 13:20:32 +01:00
  • bd0be5f0af fixed memory leak Niels 2015-01-04 12:29:16 +01:00
  • 481f377cfe + guard call to std::ios_base::sync_with_stdio Niels 2015-01-04 12:05:28 +01:00
  • 9537c70b67 removing flawed test case Niels 2015-01-03 17:51:14 +01:00
  • 764ed26c41 cleanup Niels 2015-01-03 17:18:17 +01:00
  • 18364aac85 parser returns an object Niels 2015-01-02 17:19:40 +01:00
  • 16c30cff8b removed old C fragments Niels 2015-01-02 15:29:36 +01:00
  • af4aca9edd + better string handling Niels 2015-01-02 12:47:32 +01:00
  • 85abe926cf fixed coveralls call to ignore benchmarks folder Niels 2014-12-30 12:02:38 +01:00
  • 6995d33fb1 + fixed documentation bugs Niels 2014-12-30 11:57:58 +01:00
  • 2335d3f3d5 tidy up Niels 2014-12-30 11:47:28 +01:00
  • 39cf26e2db minor changes Niels 2014-12-30 11:29:59 +01:00
  • 2be4f24837 + updated reference Niels 2014-12-30 11:19:35 +01:00
  • 9e61092fc6 + overworked parser Niels 2014-12-30 10:54:01 +01:00
  • 4e44390090 + fixed a bug in the stream input Niels 2014-12-29 21:13:03 +01:00
  • 15a9d3cff6 minor changes Niels 2014-12-29 19:54:31 +01:00
  • 0b8dda1e0c minor changes Niels 2014-12-29 18:32:17 +01:00
  • f50fdd08a7 syntax highlighting Niels 2014-12-29 18:20:55 +01:00
  • 6687ea1a36 updated reference Niels 2014-12-29 18:19:06 +01:00
  • cff4d40afd type reference Niels 2014-12-29 17:07:00 +01:00
  • a8c4f84fb8 + removed data() function Niels 2014-12-29 16:45:54 +01:00
  • 515d731fd4 + documentation Niels 2014-12-29 13:35:52 +01:00
  • 725202356b + fix memory issues Niels 2014-12-29 12:51:20 +01:00
  • 2c1b3e5108 + small cleanup Niels 2014-12-29 00:02:13 +01:00
  • 3985226f76 issue badge Niels 2014-12-28 23:21:46 +01:00
  • bed47db168 + that could be it! Niels 2014-12-28 23:09:31 +01:00
  • 776611c270 + another check Niels 2014-12-28 22:59:11 +01:00
  • 0ced78bfa8 + test Niels 2014-12-28 22:51:27 +01:00
  • b573841ace + more test cases Niels 2014-12-28 22:38:57 +01:00
  • 98af0887f2 + more test cases Niels 2014-12-28 22:29:06 +01:00
  • ea85da8a55 + more test cases Niels 2014-12-28 22:16:58 +01:00
  • aacb58e56b + more test cases Niels 2014-12-28 22:07:10 +01:00
  • 48a349a058 + more test cases Niels 2014-12-28 21:53:13 +01:00
  • 8f45d9351e + overworked switches Niels 2014-12-28 20:07:56 +01:00
  • 4810091bab + more test cases Niels 2014-12-28 19:51:02 +01:00
  • b2b5e4e7e1 + more test cases Niels 2014-12-28 18:12:07 +01:00
  • cd48a01b20 + more test Niels 2014-12-28 18:00:50 +01:00
  • d3216300b2 + more test cases Niels 2014-12-28 17:26:33 +01:00
  • ea94518a64 + more test cases Niels 2014-12-28 17:09:38 +01:00
  • 5b1f69ce5b + overworked comments Niels 2014-12-28 16:48:22 +01:00
  • 45b101d200 + more test cases Niels 2014-12-28 15:57:43 +01:00
  • 6561e4e424 + execute unit tests explicitly Niels 2014-12-28 15:46:36 +01:00
  • 75b2f4098d + more test cases Niels 2014-12-28 15:41:33 +01:00
  • a68b4cafa2 + more test cases Niels 2014-12-28 14:57:21 +01:00
  • 2e26faf91c + more test cases Niels 2014-12-28 14:39:34 +01:00
  • 88786c86bb more test cases Niels 2014-12-28 13:40:19 +01:00
  • ef5b589686 more test cases Niels 2014-12-28 13:31:24 +01:00
  • 215391983a + more test cases Niels 2014-12-28 13:22:06 +01:00
  • 1c10efb7be + error fix Niels 2014-12-28 13:11:50 +01:00
  • 0720323ed7 another test case Niels 2014-12-28 13:09:38 +01:00
  • 8d4f675151 + test cases for clear() Niels 2014-12-28 12:50:52 +01:00
  • b60fe6e7e2 - removed old test cases Niels 2014-12-28 12:38:08 +01:00
  • 23006bd57b exclude tests Niels 2014-12-28 12:24:52 +01:00
  • 87d24ca670 pass gcov version Niels 2014-12-28 12:20:53 +01:00
  • 08a60a7803 clang seems not to work Niels 2014-12-28 11:27:38 +01:00
  • 1cb6426ddc wrong package name Niels 2014-12-28 11:24:40 +01:00
  • 41ab5b1f59 + fixing coverall Niels 2014-12-28 11:20:48 +01:00
  • 822172c502 make pretty Niels 2014-12-28 11:15:13 +01:00
  • 9f562caa2c Merge pull request #5 from nlohmann/2.0 Niels 2014-12-28 11:09:35 +01:00
  • 30ac86a0fe + updated README Niels 2014-12-28 11:06:01 +01:00
  • db804169c7 added coverage badge Niels 2014-12-28 09:29:33 +01:00
  • b57179e0fe + fixed a compiler warning Niels 2014-12-28 09:23:49 +01:00
  • 36fcc942c4 using GCC 4.8 for Travis Niels 2014-12-28 09:21:06 +01:00
  • fbad7fac17 2.0 preview Niels 2014-12-28 09:11:01 +01:00
  • d1ac3d9938 benchmark Niels 2013-12-11 13:23:50 +01:00
  • 5dbdba3c43 towards a benchmark Niels 2013-12-11 10:50:50 +01:00
  • bbc0f64fa5 a Makefile target for test coverage Niels 2013-12-11 10:23:31 +01:00
  • d47a81296f fixed a typo Niels 2013-12-11 08:49:07 +01:00