Niels
dcf71748a6
Merge pull request #26 from wancw/fix_clang_string_casting
...
Fix string conversion under Clang
2015-01-12 22:54:39 +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
Niels
80b5db16b5
Merge pull request #24 from Teemperor/fix_string_dumping
...
Fixed dumping of strings
2015-01-11 14:03:53 +01:00
Niels
cc7e942870
Merge pull request #23 from Teemperor/gcc_remark_readme
...
Added a remark to the readme that coverage is GCC only for now
2015-01-11 12:47:00 +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
0fcc414995
More testing and updated CMake to allow calling private functions from the tests
2015-01-10 18:28:53 +01:00
Raphael Isemann
85888e8205
Added a remark to the readme that coverage is GCC only for now
2015-01-10 18:09:46 +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
Niels
3fa2e900ef
+ added Thanks section to README
2015-01-09 20:48:06 +01:00
Niels
69195e070f
Merge pull request #21 from Teemperor/fixed_escaped_chars
...
Implemented the JSON spec for string parsing for everything but the \uXXXX escaping - see issue #12 .
2015-01-09 20:32:08 +01:00
Raphael Isemann
13efc7a02a
More tests to get line coverage backt o 100%
2015-01-09 20:24:58 +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
52f399d55f
created a header-only version (see issue #16 )
2015-01-09 18:16:27 +01:00
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
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
