Commit graph

918 commits

Author SHA1 Message Date
Kirk Shoop
3486a5d9bb add the std iterator typedefs to iterator and const_iterator 2015-01-09 07:33:57 -08: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
Raphael Isemann
4a39bfb17e Fixed typo in comments 2015-01-09 11:57:39 +01:00
Raphael Isemann
fa0ee9c927 Fixed escaped quotes 2015-01-08 22:35:48 +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
Elliot Goodrich
0773f40a8e Fix double delete on std::bad_alloc exception
If the new operator throws in the json::find methods then result.oi_ is
deleted again in the destructor of json::iterator/json::const_iterator,
which is a double delete and undefined behaviour.
2015-01-06 09:12:55 +00: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
Raphael Isemann
67459fcd83 Added CMake to the README 2015-01-05 11:29:41 +01:00
Raphael Isemann
bd4e0e4fee Merge branch 'master' of github.com:nlohmann/json 2015-01-05 11:20:32 +01:00
Raphael Isemann
0f371b4086 CMake and coverage report 2015-01-05 11:19:42 +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