Commit Graph
100 Commits
Author SHA1 Message Date
Niels 2443aa6521 updated README 2015-01-09 17:50:50 +01:00
Niels 33f5236687 added missing header 2015-01-09 17:40:14 +01:00
Niels 535aef5ad0 Merge pull request #19 from kirkshoop/stditerator
add the std iterator typedefs to iterator and const_iterator
2015-01-09 17:37:42 +01:00
Niels 33f5e74905 minor syntax adjustments 2015-01-09 16:38:34 +01:00
Niels 661a44d156 Merge pull request #18 from Teemperor/fix_quote_escaping
Fixed escaped quotes (issue #17)
2015-01-09 16:32:39 +01:00
Niels 4647401030 fixed #15 2015-01-06 22:05:32 +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 d84f8ebb02 valgrind parameter is not understood in travis 2015-01-06 18:57:44 +01:00
Niels 43a85be471 travis now checks with valgrind 2015-01-06 18:52:14 +01:00
Niels 5f05d02c6a Merge pull request #14 from elliotgoodrich/master
Fix double delete on std::bad_alloc exception
2015-01-06 18:43:21 +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 f0582a8b60 ignore some CMake files 2015-01-05 20:36:31 +01:00
Niels bf768d96d9 minor Markdown error 2015-01-05 20:30:34 +01:00
Niels b39f78924a Merge pull request #6 from Teemperor/master
Added CMake and lcov
2015-01-05 20:28:56 +01:00
Niels a9669a410d removed "noexpect" from all functions that use new 2015-01-04 23:18:24 +01:00
Niels 540cda6118 used _-suffix for member variables 2015-01-04 23:09:30 +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 bd0be5f0af fixed memory leak 2015-01-04 12:29:16 +01:00
Niels 481f377cfe + guard call to std::ios_base::sync_with_stdio 2015-01-04 12:05:28 +01:00
Niels 9537c70b67 removing flawed test case 2015-01-03 17:51:14 +01:00
Niels 764ed26c41 cleanup 2015-01-03 17:18:17 +01:00
Niels 18364aac85 parser returns an object 2015-01-02 17:19:40 +01:00
Niels 16c30cff8b removed old C fragments 2015-01-02 15:29:36 +01:00
Niels af4aca9edd + better string handling 2015-01-02 12:47:32 +01:00
Niels 85abe926cf fixed coveralls call to ignore benchmarks folder 2014-12-30 12:02:38 +01:00
Niels 6995d33fb1 + fixed documentation bugs 2014-12-30 11:57:58 +01:00
Niels 2335d3f3d5 tidy up 2014-12-30 11:47:28 +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 9e61092fc6 + overworked parser 2014-12-30 10:54:01 +01:00
Niels 4e44390090 + fixed a bug in the stream input 2014-12-29 21:13:03 +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 f50fdd08a7 syntax highlighting 2014-12-29 18:20:55 +01:00
Niels 6687ea1a36 updated reference 2014-12-29 18:19:06 +01:00
Niels cff4d40afd type reference 2014-12-29 17:07:00 +01:00
Niels a8c4f84fb8 + removed data() function 2014-12-29 16:45:54 +01:00
Niels 515d731fd4 + documentation 2014-12-29 13:35:52 +01:00
Niels 725202356b + fix memory issues 2014-12-29 12:51:20 +01:00
Niels 2c1b3e5108 + small cleanup 2014-12-29 00:02:14 +01:00
Niels 3985226f76 issue badge 2014-12-28 23:21:46 +01:00
Niels bed47db168 + that could be it! 2014-12-28 23:09:31 +01:00
Niels 776611c270 + another check 2014-12-28 22:59:11 +01:00
Niels 0ced78bfa8 + test 2014-12-28 22:51:27 +01:00
Niels b573841ace + more test cases 2014-12-28 22:38:57 +01:00
Niels 98af0887f2 + more test cases 2014-12-28 22:29:06 +01:00
Niels ea85da8a55 + more test cases 2014-12-28 22:16:58 +01:00
Niels aacb58e56b + more test cases 2014-12-28 22:07:10 +01:00
Niels 48a349a058 + more test cases 2014-12-28 21:53:13 +01:00
Niels 8f45d9351e + overworked switches 2014-12-28 20:07:56 +01:00
Niels 4810091bab + more test cases 2014-12-28 19:51:02 +01:00
Niels b2b5e4e7e1 + more test cases 2014-12-28 18:12:07 +01:00
Niels cd48a01b20 + more test 2014-12-28 18:00:50 +01:00
Niels d3216300b2 + more test cases 2014-12-28 17:26:33 +01:00
Niels ea94518a64 + more test cases 2014-12-28 17:09:38 +01:00
Niels 5b1f69ce5b + overworked comments 2014-12-28 16:48:22 +01:00
Niels 45b101d200 + more test cases 2014-12-28 15:57:43 +01:00
Niels 6561e4e424 + execute unit tests explicitly 2014-12-28 15:46:36 +01:00
Niels 75b2f4098d + more test cases 2014-12-28 15:41:33 +01:00
Niels a68b4cafa2 + more test cases 2014-12-28 14:57:21 +01:00
Niels 2e26faf91c + more test cases 2014-12-28 14:39:34 +01:00
Niels 88786c86bb more test cases 2014-12-28 13:40:19 +01:00
Niels ef5b589686 more test cases 2014-12-28 13:31:24 +01:00
Niels 215391983a + more test cases 2014-12-28 13:22:06 +01:00
Niels 1c10efb7be + error fix 2014-12-28 13:11:50 +01:00
Niels 0720323ed7 another test case 2014-12-28 13:09:38 +01:00
Niels 8d4f675151 + test cases for clear() 2014-12-28 12:50:52 +01:00
Niels b60fe6e7e2 - removed old test cases 2014-12-28 12:38:08 +01:00
Niels 23006bd57b exclude tests 2014-12-28 12:24:52 +01:00
Niels 87d24ca670 pass gcov version 2014-12-28 12:20:53 +01:00
Niels 08a60a7803 clang seems not to work 2014-12-28 11:27:38 +01:00
Niels 1cb6426ddc wrong package name 2014-12-28 11:24:40 +01:00
Niels 41ab5b1f59 + fixing coverall 2014-12-28 11:20:48 +01:00
Niels 822172c502 make pretty 2014-12-28 11:15:13 +01:00
Niels 9f562caa2c Merge pull request #5 from nlohmann/2.0
Version 2.0
2014-12-28 11:09:35 +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 b57179e0fe + fixed a compiler warning
+ added coveralls
2014-12-28 09:23:49 +01:00
Niels 36fcc942c4 using GCC 4.8 for Travis 2014-12-28 09:21:06 +01:00
Niels fbad7fac17 2.0 preview 2014-12-28 09:11:01 +01:00
Niels d1ac3d9938 benchmark 2013-12-11 13:23:50 +01:00
Niels 5dbdba3c43 towards a benchmark 2013-12-11 10:50:50 +01:00
Niels bbc0f64fa5 a Makefile target for test coverage 2013-12-11 10:23:31 +01:00
Niels d47a81296f fixed a typo 2013-12-11 08:49:07 +01:00
Niels 77fa133946 removed unused flags 2013-12-11 08:41:12 +01:00
Niels 278a9e7052 simplified code 2013-12-11 08:41:02 +01:00
Niels 442cc9b6de added debug output to test cases 2013-12-11 08:40:53 +01:00
Niels 81367a9a10 fixed a cppcheck warning 2013-12-10 12:44:23 +01:00
Niels Lohmann a8f62ca052 + a fix for C++98 2013-07-15 08:32:10 +02:00
Niels 9a567d9d2d - tidied code
- added more documentation
2013-07-11 14:19:11 +02:00
Niels 52c2cb8ce7 - removed pointers to POD inside the union 2013-07-10 14:57:51 +02:00
Niels 4e6a400a23 - reorganized payload 2013-07-10 14:33:17 +02:00