zewt
2775b3de5d
Merge 12aa72aedd into 54d3cab568
2016-03-29 23:35:53 +00: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
Niels
c6a6a024f7
fixes #214
2016-03-06 20:03:05 +01:00
Niels
10a884473e
fixed #217
2016-03-04 07:30:08 +01:00
Niels
8ee3d24046
Merge pull request #218 from Annihil/master
...
Corrected readme
2016-03-04 07:26:27 +01:00
Annihil
78a020354d
Corrected readme
...
Internally, the elements in a map are always sorted by its key following a specific strict weak ordering criterion indicated by its internal comparison object (of type Compare).
With string type, the default comparator is alphabetical order, and thus two come after three.
2016-03-02 02:01:40 +01:00
Glenn Maynard
12aa72aedd
Update the README to give better instructions for Android.
...
The MingW link doesn't help for Android, and points people down the
wrong path. On Android all you need to do is tell the build system
to use a newer compiler and standard library.
The unit tests run successfully with this configuration on Android.
Related to #136 .
2016-02-28 17:28:29 -06:00
Niels
53879f9c99
cleanup
2016-02-21 08:17:11 +01:00
Niels
502cedf70b
Merge pull request #213 from whackashoe/patch-1
...
Create PULL_REQUEST_TEMPLATE.md
2016-02-21 08:15:46 +01:00
Jett LaRue
df3ab06f2e
Create PULL_REQUEST_TEMPLATE.md
2016-02-20 16:22:46 -06:00
Niels
f965c4c35b
improved code coverage
2016-02-14 22:56:51 +01:00
Niels
d869b0a387
updated online documentation
2016-02-14 22:28:56 +01:00
Niels
3a92559fa9
cleanup
2016-02-14 22:24:45 +01:00
Niels
09654b3104
Merge pull request #208 from nlohmann/noexcept
...
fixed noexcept; added constexpr
2016-02-14 22:18:39 +01:00
Niels
f160f33fb5
update from master
2016-02-14 21:44:00 +01:00
Niels
7f4736b546
added serialization to fuzz testing
2016-02-14 21:36:56 +01:00
Niels
a3eecdc383
updated Catch to v1.3.4
2016-02-14 21:36:43 +01:00
Niels
153e105164
cleanup after #207
2016-02-14 18:38:29 +01:00
Niels
ec098ffcc2
Merge pull request #207 from msm-/afl-fuzz
...
add support for afl-fuzz testing
2016-02-14 17:24:54 +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
Michael Macnair
9e500b49ac
Add support for afl-fuzz testing
...
"make fuzz" creates a simple executable that de-serialises stdin
and re-serialises to stdout.
"make fuzz_testcases" extracts the smaller json test cases into
a testcases directory.
The library can then be fuzzed as follows:
CC=afl-clang-fast make fuzz
make fuzz_testcases
mkdir out
afl-fuzz -i testcases -o out ./fuzz
2016-02-12 09:35:08 +00:00
Niels
61fe90f998
Merge pull request #205 from nlohmann/issue204
...
replaced ssize_t occurrences with auto (fixes #204 )
2016-02-10 21:41:55 +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
1cc4717582
tried Clang 3.9
2016-02-09 21:26:40 +01:00
Niels
be20555985
removed gitter
2016-02-07 17:24:51 +01:00
Niels
236b7afff5
updated and fixed online version
2016-02-07 15:07:17 +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
2ff2e10660
checking Erasable concept
2016-02-05 22:30:37 +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
104c4b5286
improve code coverage
2016-01-31 15:04:38 +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
740239cef8
added a note about GCC 4.8 ( #163 )
2016-01-30 21:17:08 +01:00
Niels
36719fdb18
using re2c 0.16 (minimized automaton)
2016-01-30 20:33:31 +01:00
Niels
9d063d90e3
removed "using namespace" from examples
2016-01-30 20:23:14 +01:00
Niels
ade2f7c92d
updated ChangeLog
2016-01-30 16:51:53 +01:00
Niels
2224435f9b
cleanup after #200
2016-01-30 13:36:15 +01:00
Niels
cd44e43457
Merge pull request #200 from twelsby/issue199
...
Fixed issue #199 - Small bugs in json.hpp (get_number) and unit.cpp (non-standard integer type test)
2016-01-30 13:32:22 +01:00
Trevor Welsby
561accb068
Fixed issue #199
2016-01-30 12:41:12 +10:00
Niels
ff6f723195
removed token
2016-01-26 23:30:51 +01:00
Niels
3dfa56795f
added note
2016-01-26 23:27:07 +01:00
Niels
1c80c2231f
linked releases in ChangeLog
2016-01-26 23:10:52 +01:00
