Niels
494cc15650
Merge branch 'develop' into feature/issue260
2016-06-07 12:13:03 +02:00
Niels
9e2dfd19e8
minor cleanup
2016-06-07 00:20:53 +02:00
Niels
b508d1f1c4
fix proposal for #260
2016-06-06 18:50:39 +02:00
Niels
0a393b8374
indentation cleanup
2016-05-12 07:34:36 +02:00
Niels
0e0ecb2c14
fixed a warning and update ChangeLog
2016-05-12 00:32:18 +02:00
Niels
f1e61896fb
fixed a shadow error
2016-05-11 18:43:12 +02:00
Niels
91aa4c9def
Merge branch 'develop' into feature/issue239
2016-05-11 17:23:01 +02:00
Niels
9ecf83f630
working on #235
2016-05-08 20:28:20 +02:00
Niels
6d8e00ade8
another try to remove a warning
2016-05-08 17:17:17 +02:00
Niels
ac3036dc0f
Merge branch 'develop' into feature/issue239
2016-05-08 17:07:08 +02:00
Niels
85a30813c8
removed unnecessary code (numbers must not begin with "+")
2016-05-07 20:22:58 +02:00
Niels
c04275966f
improved test coverage
2016-05-07 18:33:43 +02:00
Niels
9073b2ca39
hopefully removed some warnings
2016-04-30 16:22:27 +02:00
Niels
1d3b4dd158
added test cases
2016-04-30 00:03:47 +02:00
Niels
62f81a60d7
hopefully fixed a warning
2016-04-29 21:23:13 +02:00
Niels
5e0bf75d60
cleanup, test, and diff
2016-04-25 23:17:04 +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
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
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
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
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
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
54d3cab568
Merge pull request #226 from lv-zheng/fix_int64
...
Use namespace std for int64_t and uint64_t
2016-03-29 10:35:24 +02:00
Lv Zheng
3e76e61b9c
Use namespace std for int64_t and uint64_t
...
According to the c++11 standard, the declarations are within namespace
scope of the namespace `std'. Add `std::' to avoid unnecessary
requirement of implementations.
2016-03-28 18:11:12 +08:00
Niels
2f63e5fb45
added copyright information to files to make release more self-contained
2016-03-25 17:41:36 +01:00
Raphael Isemann
fbc25b080b
Added missing cerrno header to fix ERANGE c-error on android
2016-03-10 08:46:26 +01:00
Niels
49dc2dff68
fixed error when compiled with Clang
2016-02-14 16:58:24 +01:00
Niels
836fdfedf2
fixed an error in MSVC
2016-02-14 16:53:32 +01:00
Niels
a69b1a6f0b
added noexcept and constexpr
2016-02-14 16:42:48 +01:00
Niels
a831c787df
try to replace std::ptrdiff_t with auto (for #204 )
2016-02-10 21:19:31 +01:00
Niels
4cc4b26dd2
try to replace ssize_t occurrences with std::ptrdiff_t (for #204 )
2016-02-10 21:09:52 +01:00
Niels
fdfb39d949
improved documentation
2016-02-07 14:55:29 +01:00
Niels
3b776c08c7
clarified documentation
2016-02-07 10:45:52 +01:00
Niels
8b1a777d36
reverted change wrt. Erasable concept
2016-02-05 22:37:28 +01:00
Niels
ae5bd307a2
improved documentation
2016-02-05 22:30:25 +01:00
Niels
2c720b26ab
added a constructor from an input stream
2016-02-05 19:24:42 +01:00
Niels
6aa881988d
improved documentation
2016-01-31 13:05:39 +01:00
Niels
22127a4b85
moved documentation to index markdown file
2016-01-30 22:05:01 +01:00
Niels
36719fdb18
using re2c 0.16 (minimized automaton)
2016-01-30 20:33:31 +01:00
Niels
2224435f9b
cleanup after #200
2016-01-30 13:36:15 +01:00
Trevor Welsby
561accb068
Fixed issue #199
2016-01-30 12:41:12 +10:00
Niels
2468631dc9
overworked examples
2016-01-26 20:07:03 +01:00
Niels
707732a53e
clean up after #193
2016-01-26 19:50:49 +01:00
Niels
e46cc6327f
Merge pull request #193 from twelsby/issue178
...
Issue #178 - Extending support to full uint64_t/int64_t range and unsigned type (updated)
2016-01-26 19:40:16 +01:00
Niels
11ae1d0f09
cleanup after #196
2016-01-26 19:13:03 +01:00
Trevor Welsby
a4a88b1b7d
Issue #195 - update Travis to Trusty due to gcc/clang strtod() bug
2016-01-26 08:36:18 +10:00
Niels
c09d03fba7
fixed documentation
2016-01-24 22:43:00 +01:00
Niels
31093694ce
fixed version number
2016-01-24 22:21:27 +01:00
Niels
aee99b362d
some editing
2016-01-24 19:24:06 +01:00
Trevor Welsby
0f28c69499
Merge upstream commits and resolve conflicts
2016-01-25 02:48:38 +10:00
Trevor Welsby
281492c581
Merge upstream commits and resolve conflicts
2016-01-25 02:42:20 +10:00
Niels
54a4139157
cleanup after #191
2016-01-24 17:33:46 +01:00
Trevor Welsby
4620960b72
Disable problematic test for GCC/clang, remove debug dump from unit.cpp
2016-01-25 02:22:46 +10:00
Niels
ad5d1dabb2
Merge pull request #191 from twelsby/issue186
...
Fixed Issue #186 - add strto(f|d|ld) overload wrappers, "-0.0" special case and FP trailing zero
2016-01-24 17:21:22 +01:00
Trevor Welsby
81b7079255
Kill unused argument warnings in GCC/clang
2016-01-25 02:13:39 +10:00
Trevor Welsby
421affd06e
Merge upstream commits and resolve conflicts
2016-01-25 02:01:01 +10:00
Niels
3245a0dc06
fixed #194
2016-01-24 16:42:13 +01:00
Trevor Welsby
12ef668335
Merge upstream commits and resolve conflicts
2016-01-25 01:15:13 +10:00
Trevor Welsby
d7ef2ccffd
Issue #178 - fully support int64_t/uint64_t numbers, add unsigned type
2016-01-25 01:04:37 +10:00
Niels
d7d1e55648
applied include-what-you-use
2016-01-24 13:28:08 +01:00
Niels
e00b00fea8
Merge pull request #190 from twelsby/issue185
...
fixed #185 - remove approx() and use #pragma to kill warnings
2016-01-24 12:55:40 +01:00
Niels
600ad330c5
cleanup after PR #189
2016-01-24 11:00:54 +01:00
Trevor Welsby
c1f5f0451d
Add workaround for gcc < 5 not supporting std::defaultfloat
2016-01-24 17:54:50 +10:00
Trevor Welsby
bd8db5d40e
Remove VS induced tabs
2016-01-24 17:15:44 +10:00
Trevor Welsby
a1c6f16bd3
Fix Issue #186 - add overload wrappers for strto(f|d|ld)
2016-01-24 17:00:11 +10:00
Trevor Welsby
3a1403409f
Issue #185 - remove approx() and use #pragma to kill warnings
2016-01-23 17:45:30 +10:00
Trevor Welsby
7e3245786c
Fixed issue #171 - added extra operator[] template overloads
2016-01-23 17:03:45 +10:00
Trevor Welsby
9de14a4861
Fixed issue #167 - removed operator ValueType() condition for VS2015
2016-01-23 16:34:15 +10:00
Niels
a04bd4f851
cleanup after #184
2016-01-20 21:14:58 +01:00
dariomt
db3c7fdb96
added missing template keyword (required by clang)
2016-01-19 16:20:27 +01:00
dariomt
e2f0e8b945
added missing typename (required by clang/gcc)
2016-01-19 14:56:07 +01:00
dariomt
4d079d135e
replicate code changes into re2c file
2016-01-18 11:32:24 +01:00
dariomt
e1645a09e9
Merge branch 'master' of https://github.com/nlohmann/json
2016-01-18 10:08:58 +01:00
Niels
57e018483a
it's 2016 already...
2016-01-13 20:19:05 +01:00
Niels
4511145d3d
removing unused catch variables ( fixes #180 )
2016-01-13 19:19:35 +01:00
