Niels
7dc07b75de
Merge branch 'develop' into feature/json-patch
2016-04-26 20:32:24 +02:00
Niels
0f64761663
Merge pull request #238 from robertmrk/cmake-package
...
Implement additional integration options
2016-04-26 20:31:19 +02:00
Niels
5e0bf75d60
cleanup, test, and diff
2016-04-25 23:17:04 +02:00
Robert Marki
192a692034
Generate package config files in cmake's current binary directory
...
Generate the config files of the package in CMAKE_CURRENT_BINARY_DIR
instead of CMAKE_BINARY_DIR because the later will refer to the main
project's binary directory if the library is included in the project
using the add_subdirectory command.
2016-04-25 11:55:03 +02:00
Robert Marki
b1a2e9a715
Create an install target for the project
...
- define the project's version in the cmake listfile
- create a config and config version file for the cmake package
- install the json.hpp file and the package's targets, config and
config version files
2016-04-25 10:27:19 +02:00
Robert Marki
30e396043a
Export library target and store build directory in package registry
2016-04-25 09:36:05 +02:00
Robert Marki
28f73ed406
Refactor CMake listfile to define an interface imported library
...
Define the library as an interface imported library so other targets
can use the library as a dependency and use the interface properties
of the library.
2016-04-24 19:56:20 +02:00
Niels
96cfe7463f
fixed some warnings
2016-04-24 19:09:12 +02:00
Niels
8d4cf5ef8d
oops
2016-04-24 19:04:10 +02:00
Niels
fb54e212b6
clean up and added tests
2016-04-24 19:03:33 +02:00
Niels
09e9f6dcd4
implemented "move"
2016-04-24 17:43:27 +02:00
Niels
855cf2307b
extended "add" to cope with arrays
2016-04-24 16:51:06 +02:00
Niels
397ada22d3
implemented remove
2016-04-20 16:52:00 +02:00
Niels
fa03cf0c63
replace and copy
2016-04-20 15:41:33 +02:00
Niels
70fc5835cb
started implementing JSON Patch (RFC 6902)
2016-04-18 22:41:36 +02:00
Niels
3ca1bfdd9d
made a function static
2016-04-17 23:41:52 +02:00
Niels
f4107d0d9c
updated documentation
2016-04-17 23:36:37 +02:00
Niels
9f8da4c650
Merge branch 'feature/json-pointer' into develop
2016-04-17 23:23:34 +02:00
Niels
08c97df420
added examples
2016-04-17 23:18:07 +02:00
Niels
1dee40a969
fixed test case
2016-04-17 22:34:39 +02:00
Niels
6268287940
improved documentation and test coverage
2016-04-17 22:08:21 +02:00
Niels
7034ae2486
improved test coverage
2016-04-17 19:12:12 +02:00
Niels
0835eb293f
improved RFC compliance and code coverage
2016-04-17 18:54:54 +02:00
Niels
f883a04c87
more documentation
2016-04-17 18:18:49 +02:00
Niels
40e899a819
cleanup and documentation
2016-04-17 17:39:35 +02:00
Niels
f834965b44
implemented deflatten function
2016-04-16 20:45:40 +02:00
Niels
007359675b
added a flatten function
2016-04-16 16:39:20 +02:00
Niels
3401954f5b
cleaned up API
2016-04-16 14:02:14 +02:00
Niels
3a3e064287
Merge branch 'develop' into feature/json-pointer
2016-04-16 12:19:31 +02:00
Niels
76a5a776eb
cleanup after #234
2016-04-16 12:19:10 +02:00
Niels
6f0053a254
Merge branch 'support-move-iterators' of https://github.com/robertmrk/json into develop
2016-04-16 12:12:16 +02:00
Niels
94af8abdff
overworked reference token parsing
2016-04-13 23:23:54 +02:00
Niels
2cb925c186
adding support for escaped reference tokens
2016-04-13 17:41:19 +02:00
Robert Marki
2197f5f0a6
Make the indirection and dereference operators of iterator const
...
fixes #233
2016-04-13 13:49:53 +02:00
Niels
726051e9b7
very first draft of a JSON pointer API
2016-04-11 23:17:03 +02:00
Niels
507322e6f2
updated ChangeLog
2016-04-10 19:36:09 +02:00
Niels
15f8c848fa
fixed typo and indentation
2016-04-10 18:23:43 +02:00
Niels
170b70f082
Merge pull request #232 from nlohmann/issue228
...
make serialization locale-independent (fixes #228 )
2016-04-07 17:16:58 +02:00
Niels
a744c62696
made tests independent of "C" locale
2016-04-05 22:28:27 +02:00
Niels
0b60d970e9
make code independent of concrete locale
2016-04-05 22:12:12 +02:00
Niels
31bccc83b9
fixed locale problems
2016-04-05 21:55:51 +02:00
Niels
43ee70cef8
revert changes to master
2016-04-05 20:47:47 +02:00
Niels
44a8e9bf35
locale-independent dump
2016-04-03 16:33:30 +02:00
Niels
9c233be567
merged #201
2016-04-03 14:08:38 +02:00
Niels
04edafbddc
Merge pull request #227 from kevin--/kevin--/noexcept_documentation
...
fixes #223 by updating README.md
2016-03-30 20:21:35 +02:00
Niels
1baa5a7350
fixed #225
2016-03-30 20:18:34 +02:00
Niels
0951a1f94c
Merge pull request #222 from Teemperor/fixAndroid
...
Added missing cerrno header to fix ERANGE compile error on android
2016-03-30 20:12:55 +02:00
Niels
96443b0b97
added more thanks to the README file
2016-03-30 19:47:08 +02:00
Niels
27530c7840
better notes for Android (manually closes #215 )
2016-03-30 19:42:54 +02:00
Niels
888635b749
cleanup after PR #212 and PR #226
2016-03-30 19:23:11 +02:00
