haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-15 10:55:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
166 commits 12 branches 56 tags 226 MiB
Commit graph

86 commits

Author SHA1 Message Date
Niels 5199382c91 worked on issue #8 and #27 2015-01-24 20:33:06 +01:00
Niels 807de40463 implemented missing operator[] 2015-01-23 18:27:58 +01:00
Niels 6ee46ed519 cleanup 2015-01-21 17:42:45 +01:00
Niels d66743b9c2 fixed a memory leak 2015-01-21 15:59:52 +01:00
Niels bbc45eb4d8 overworked iterators 2015-01-21 15:43:24 +01:00
Niels 76be1ae1f6 + more adjustments toward a real container 2015-01-21 11:47:03 +01:00
Niels 3c780f0f57 + generic constructors for arrays and objects 2015-01-21 09:40:46 +01:00
Niels a7a946bd18 added missing header 2015-01-20 21:15:14 +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 a144800774 + implemented member and non-member swap 2015-01-19 19:51:07 +01:00
Niels 7724d34741 fixed #31: only use spaces in pretty print 2015-01-18 10:58:48 +01:00
Niels 19043d2003 this should fix #28 2015-01-13 19:07:53 +01:00
WanCW 36f6199898 Fix string conversion under Clang 2015-01-12 20:03:41 +08:00
Niels bd05c7a18a small tidy up after pull request #22 
- removed IDE leftovers
- adjusted const’ness of some functions
- style guide
 2015-01-11 15:16:14 +01:00
Niels 6533b33387 Merge pull request #22 from Teemperor/unicode_escaping 
Unicode escaping
 2015-01-11 15:08:13 +01:00
Niels 8d9c2bea4e + applied style guide 2015-01-11 15:05:04 +01:00
Raphael Isemann 7b97ec884e Fixed dumping of strings 2015-01-10 22:04:57 +01:00
Raphael Isemann a866a9d980 Reapplied code style fixes 2015-01-10 19:53:13 +01:00
Raphael Isemann a409ba9488 Fixed build 2015-01-10 18:46:01 +01:00
Raphael Isemann 6105ce5484 Allowed automerge 2015-01-10 17:33:18 +01:00
Raphael Isemann 1287f03084 Code point are two words, and so the "P" should be capital 2015-01-10 16:50:39 +01:00
Raphael Isemann 5a54e46709 Fully implemented the JSON spec 2015-01-10 16:49:10 +01:00
Raphael Isemann 222aacc213 Quick and dirty implementation for basic multilingual plane in the unicode escape mechanism 2015-01-10 10:36:30 +01:00
Niels 0cd2ecf48f minor style adjustments 2015-01-09 20:48:16 +01:00
Raphael Isemann 7f4fcc51f6 Implemented the JSON spec for string parsing for everything but the \uXXXX escaping for unicode 2015-01-09 20:03:18 +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
Kirk Shoop 3486a5d9bb add the std iterator typedefs to iterator and const_iterator 2015-01-09 07:33:57 -08: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 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 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 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 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 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 9e61092fc6 + overworked parser 2014-12-30 10:54:01 +01:00