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
Niels
151d43f63e
fixing numerous typos ( fixes #179 )
2016-01-13 19:14:33 +01:00
Niels
4a452f11f9
added assertions ( #168 )
2016-01-03 17:05:27 +01:00
Niels
9b07504e23
fix for #166
2016-01-01 18:33:58 +01:00
Niels
3905406f9c
removed an unnecessary cast ( fixed #162 )
2015-12-29 12:30:05 +01:00
Niels
cb5581392a
preparing 1.0.0 release
2015-12-28 14:51:57 +01:00
Niels
80cdecaadd
fixed a cppcheck warning
2015-12-27 18:07:21 +01:00
Niels
d80bbffc78
minor cleanup
2015-12-27 17:58:36 +01:00
Niels
7371c71d2a
using CHECK_THROWS_WITH to check exceptions ( #160 )
2015-12-27 15:30:30 +01:00
Niels
d6b8830e03
more work on exceptions ( #160 )
2015-12-26 13:17:32 +01:00
Niels
dc8ab92552
more tests for exceptions ( #160 )
2015-12-25 13:04:40 +01:00
Niels
76e5e29eda
overworked exceptions and tests ( #160 )
2015-12-25 11:46:18 +01:00
Niels
8620583cf9
cleanup
2015-12-23 12:05:57 +01:00
Niels
fcbd984e0f
cleanup
2015-12-23 08:44:34 +01:00
Niels
70493a10d1
iterator_wrapper for const objects ( #83 )
2015-12-23 08:21:29 +01:00
Niels
00f9296db5
some cleanup for #83
2015-12-22 18:07:51 +01:00
Niels
67c2d90a21
working on #160
2015-12-22 13:27:40 +01:00
Niels
4351698c83
re-adding const version operator[] ( #135 , #159 )
...
It was a good idea to implement a const version of operator[] it in the
first place. I was a pity that this implementation was flawed. It was a
mistake to remove the const version completely. This commit
re-introduces the const version. My apologies for all the inconvenience.
2015-12-21 08:42:42 +01:00
Niels
457bfc2401
work on #144
2015-12-20 15:30:07 +01:00
Niels
1adb9d62dd
fixed #156
2015-12-17 16:52:38 +01:00
Niels
ac4d4a0f66
fixed compilation error and fixed shadow warnings
2015-12-17 16:22:15 +01:00
Niels
07033f67a5
some cleanup and more documentation
2015-12-17 15:49:33 +01:00
Niels
6ac89df54d
fix for #127
2015-12-16 12:09:59 +01:00
Niels
a615598b14
cleanup documentation; started added versions
2015-12-15 19:42:32 +01:00
Niels
1df5d726d9
undid the fix for #136
2015-12-15 18:34:07 +01:00
Niels
cd04a7d3e9
fix for #133
...
added value() function to get object value at given key or a default
value if key does not exist
2015-12-15 08:38:54 +01:00
Niels
2ba901bbf6
cleanup
2015-12-14 21:23:21 +01:00
Niels
5bc1b65676
clean up (for #154 )
2015-12-14 16:58:49 +01:00
Niels
258f04c561
fixed #154 (no more warnings for incomplete switches)
2015-12-14 16:32:37 +01:00
Niels
a70a7a8001
fixed #135 : operator[] now only works on nonconst JSON objects
2015-12-13 11:26:55 +01:00
Niels
9da8770f3a
ignore UTF-8 byte order mark ( fixes #152 )
2015-12-07 22:27:53 +01:00
Niels
22bc022745
added change from #140
2015-12-07 21:05:21 +01:00
Niels
72476b4226
cleanup after #153
2015-12-07 20:38:16 +01:00
Niels
f36f316fc7
Merge pull request #153 from whackashoe/remove_sprintf
...
Replace sprintf with hex function, this fixes #149
2015-12-07 20:35:43 +01:00
Niels
6f8e36ac3d
fixes #136
2015-12-06 17:33:52 +01:00
Jett
14d8a91f73
Replace sprintf with hex function, this fixes #149
2015-11-19 00:30:00 -06:00
Robert Marki
ec7a1d8347
Fix character skipping after a surrogate pair
...
In a string the first character following a surrogate pair is skipped by the
lexer, but the rest of the string is parsed as usual.
2015-11-13 13:13:46 +01:00
Niels
3948630374
Merge pull request #130 from dariomt/patch-1
...
removed stream operator for iterator, resolution for #125
2015-10-23 18:42:10 +02:00
Niels
8f379ef3eb
Merge pull request #137 from dariomt/patch-3
...
Detect correctly pointer-to-const
2015-10-20 22:31:15 +02:00
dariomt
652e1caa76
Apply same change to the re2c file
2015-10-19 12:34:10 +02:00
dariomt
8162a6e3a3
Apply same change to the re2c file
2015-10-19 12:26:38 +02:00
Niels
746c1a7142
cleanup
2015-10-17 12:51:59 +02:00
dariomt
5198e1f2e4
removed const in get_ptr() by accident
2015-10-16 15:45:47 +02:00
dariomt
bd2783f45c
Added get_ref()
...
Same as get_ptr() but for references.
If the type is incompatible it throws (get_ptr() returns null).
Implemented in terms of get_ptr().
2015-10-16 15:23:57 +02:00
Dario Menendez
8f97e99feb
Merge remote-tracking branch 'origin/patch-3'
2015-10-16 11:23:19 +02:00
dariomt
b342e1207c
Detect correctly pointer-to-const
...
The intention of the current code is to detect a pointer-to-const but instead it is detecting a const-pointer. See #134
2015-10-16 11:11:16 +02:00
dariomt
55cbd903e8
removed stream operator for iterator, resolution for #125
...
It doesn't really make sense to stream an iterator.
Besides, this was causing trouble in MSVC in Debug mode (see #125 )
2015-10-07 17:50:53 +02:00
Niels
57de1d602e
Cleanup
2015-10-03 13:16:59 +02:00
Niels
2550d29ded
Merge pull request #122 from d-frey/patch-1
...
exception-safe object creation, fixes #118
2015-10-03 12:29:26 +02:00
Niels
589dc2180a
Merge pull request #120 from silverweed/patch-1
...
Overload parse() to accept an rvalue reference
2015-10-03 10:43:16 +02:00
Niels
4eac295211
Merge pull request #115 from whoshuu/patch-1
...
Use the right variable name in doc string
2015-10-03 10:41:26 +02:00
Niels
b3ff862afc
Merge pull request #121 from ColinH/master
...
Fix small oversight.
2015-10-03 10:39:14 +02:00
Daniel Frey
1c43789682
Remove superfluous inefficiency
2015-09-25 20:08:35 +02:00
Daniel Frey
f7fb405564
exception-safe object creation, fixes #118
2015-09-20 20:06:33 +02:00
Huu Nguyen
2d7f1542b1
Use the right variable name in doc string
2015-09-20 07:27:34 -07:00
silverweed
8fdd20cdda
Overload parse() to accept an rvalue reference
2015-09-20 16:15:55 +02:00
Colin Hirsch
c6c37d00d1
Fix small oversight.
2015-09-20 15:04:51 +02:00
Niels
b58a93b8dd
merged #111
2015-08-14 14:45:13 +02:00
Niels
6f2da1a39a
try to avoid MSVC bug ( https://connect.microsoft.com/VisualStudio/feedback/details/797682/c-decltype-of-class-member-access-incompletely-implemented )
2015-08-13 10:24:28 +02:00
Niels
fadccc34eb
fixed iterator_wrapper
2015-08-13 10:08:55 +02:00
Niels
2707733920
fixed off-by-one error
2015-08-06 22:53:16 +02:00
Niels
11ae6da6d9
reverted “fix” for issue #107
2015-08-06 22:35:56 +02:00
Niels
2c3259320d
addressed locale-issues #107
2015-08-04 18:12:11 +02:00
Niels
e64dc532ab
fixed build
2015-08-02 21:35:07 +02:00
Niels
c974e32677
fixed the build
2015-07-30 23:02:55 +02:00
Niels
8eb32084b4
code for #83 (no tests yet)
2015-07-30 21:32:18 +02:00
Niels
a26e44d66e
prepare 1.0.0-rc1
2015-07-26 20:44:55 +02:00
Niels
359cf7993f
closed #75
...
minor changes, but the core idea remains the same
2015-07-26 18:41:58 +02:00
Niels
300fba6388
fixed Windows build
2015-07-19 13:33:03 +02:00
Niels
623c03bc49
some cleanup
2015-07-19 12:41:46 +02:00
Niels
5084159048
added changes from #105 : MSVC fixes
...
- additionally, switch off optimization flags to maybe allow build to
complete on AppVeyor
2015-07-16 18:45:19 +02:00
Niels
5c813b614f
closes #104 and integrates code from #93
...
Iterators are now implemented via const_iterators and reverse_iterator
and const_reverse_iterator now share a template class. Thanks a lot!
2015-07-14 21:21:08 +02:00
Niels
1c8d5dc211
added another insert function
2015-07-12 22:47:08 +02:00
Niels
186aefb8f2
added first insert functions
2015-07-12 18:28:23 +02:00
Niels
b2efd50a03
more documentation
2015-07-12 17:08:51 +02:00
Niels
5e1d0f1592
more documentation and some cleanup
2015-07-12 14:49:37 +02:00
Niels
c012b29ae5
worked on #102 : more documentation and examples
2015-07-08 16:55:29 +02:00
Niels
19d550c044
new implementation for (const_)reverse_iterator to cope with issue #93
2015-07-07 23:31:43 +02:00
Niels
12d174d424
fixed #100
2015-07-06 23:21:54 +02:00
Niels
e070aed8a7
cleanup
2015-07-06 21:12:50 +02:00
Niels
2bc5d893c8
refactored generic iterator into a new class primitive_iterator_t
2015-07-05 22:22:15 +02:00
Niels
82a6995306
fixed #101
2015-07-01 23:08:54 +02:00
Niels
540c58964d
closed #91
2015-06-29 20:53:01 +02:00
Niels
48c4f4d05d
more documentation
2015-06-28 19:32:09 +02:00
Niels
7d9cfb1b32
added documentation for erase functions
2015-06-28 15:49:40 +02:00
Niels
862e7000f4
fixed #94
2015-06-28 14:39:52 +02:00
Niels
3f6b10733b
addressed static analysis warnings #94
2015-06-28 14:02:47 +02:00
Niels
c58c5aa8c9
fixed #97
...
- added functions is_structured() and is_primitive()
- updated documentation
- updated test cases
2015-06-27 18:43:11 +02:00
Niels
3ffedea5c4
minor changes
2015-06-25 00:40:16 +02:00
Niels
40312fb07b
worked on #91
...
- implemented `get_ptr` function to return pointer to value member
- overworked `get` function to support pointer types
- added test cases
- added documentation (see
http://nlohmann.github.io/json/classnlohmann_1_1basic__json.html ) with
examples
2015-06-24 15:16:32 +02:00
Niels
457572184c
more documentation
...
In this commit, also the semantics for values skipped via the parser
callback has changed. Now, the top-level value is returned as “null”
instead of “discarded”.
2015-06-24 12:15:51 +02:00
Niels
48545f5b18
more documentation
2015-06-22 23:21:49 +02:00
Niels
844bfd39b5
more documentation
2015-06-22 21:44:20 +02:00
Niels
891b8f33c1
more documentation
2015-06-21 22:56:03 +02:00
Niels
c85dbef98f
more documentation
2015-06-21 22:42:32 +02:00
Niels
4bb5126502
more documentation
2015-06-21 18:30:08 +02:00
Niels
099030baeb
added alias __basic_json
2015-06-21 13:04:03 +02:00
Niels
3e28c5ff8f
commit to trigger build
2015-06-21 11:35:54 +02:00
Niels
d818bec6ac
more documentation
2015-06-21 11:29:32 +02:00
Niels
c40e85920f
more documentation
2015-06-21 09:44:12 +02:00
Niels
bb13c931b3
more documentation
2015-06-21 02:14:01 +02:00
Niels
e63c508172
overworked doxygen
2015-06-21 00:59:33 +02:00
Niels
4019380a8a
forgot a header for MSVC
2015-06-20 17:45:52 +02:00
Niels
4fb825dbce
fixed compiler warnings
2015-06-20 15:47:37 +02:00
Niels
719cc9e4d7
removed dependent to RTTI
2015-06-20 14:57:08 +02:00
