Ian Clarkson
62c76cf69f
Fix include brackets so they correspond to local includes instead of system includes
...
When building code relying on this library in Xcode, the build process throws an error (not a warning!) stating its inability to locate the presumed system includes. The `<>` angle brackets on `#include` indicate a system-level include, not a user-level include. By swapping to quotation marks for the `#include` we more accurately represent the content of the included files and Xcode builds without complaint!
2018-02-21 17:23:22 -08:00
Niels Lohmann
b779666916
👷 re-added homebrew tests
2018-02-02 00:20:04 +01:00
Niels Lohmann
97309f0da9
Merge branch 'release/3.1.0' into develop
2018-02-02 00:06:17 +01:00
Niels Lohmann
a8fcfd9880
👷 fixed travis file
2018-02-01 22:34:14 +01:00
Niels Lohmann
f5c03999d0
🔨 fixed benchmark compilation
2018-02-01 22:26:26 +01:00
Niels Lohmann
0258484626
🔖 set version to 3.1.0
...
- updated documentation wrt. new repository layout
- temporarily switched off Homebrew --HEAD building (can only be switched on after release)
- set copyright date to 2018
2018-02-01 22:20:26 +01:00
Niels Lohmann
ce7d0ebf5d
Merge pull request #944 from theodelrieu/fix/cmake_install
...
fix cmake install directory (for real this time)
2018-02-01 18:39:07 +01:00
Théo DELRIEU
14cd019861
fix cmake install directory (for real this time)
...
* Rename 'develop' folder to 'include/nlohmann'
* Rename 'src' folder to 'single_include/nlohmann'
* Use <nlohmann/*> headers in sources and tests
* Change amalgamate config file
2018-02-01 11:06:51 +01:00
Niels Lohmann
9958dde3da
Merge pull request #950 from kaidokert/develop
...
Templatize std::string in binary_reader #941
2018-02-01 09:29:53 +01:00
Kaido
aed4a080bf
Templatize std::string in binary_reader #941
2018-01-31 23:01:01 -08:00
Niels Lohmann
e8bf1f62f7
✨ added define for library version #948 #943
2018-01-31 22:36:18 +01:00
Niels Lohmann
552d153842
📝 added more statistics on binary formats
2018-01-31 21:54:38 +01:00
Niels Lohmann
60e2d28eb7
🐛 fix for #947
2018-01-31 20:53:13 +01:00
Niels Lohmann
51c774f208
📝 added documentation for binary formats
2018-01-31 17:23:11 +01:00
Niels Lohmann
57e6fddd90
🚨 fixed warnings
2018-01-30 23:57:49 +01:00
Niels Lohmann
f7131715b1
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2018-01-30 23:20:39 +01:00
Niels Lohmann
ce273af9b6
📝 added documentation for binary formats
2018-01-30 23:20:36 +01:00
Niels Lohmann
ae235139b9
Merge pull request #940 from kaidokert/develop
...
Allow overriding THROW/CATCH/TRY macros with no-exceptions #938
2018-01-29 22:04:26 +01:00
Niels Lohmann
8049442c2a
🔨 rename yytext to token_buffer ( fixes #933 )
2018-01-29 21:56:13 +01:00
Kaido
d0c9e5fffc
Allow overriding THROW/CATCH/TRY macros with no-exceptions (redo) #938
2018-01-28 14:42:13 -08:00
Niels Lohmann
b3bd3b726b
📝 added link to OSS-Fuzz project repository
2018-01-28 21:02:02 +01:00
Niels Lohmann
52e9449563
📝 added more functions to overview
2018-01-28 20:44:45 +01:00
Niels Lohmann
cb4a9c85cb
🔨 excluded code from coverage
2018-01-28 17:55:40 +01:00
Niels Lohmann
1483d39c91
🔨 moved class json_pointer into separate file #920
2018-01-28 15:36:56 +01:00
Niels Lohmann
e95578f884
📝 documented JSON Merge Patch (RFC 7386)
2018-01-28 14:36:17 +01:00
Niels Lohmann
102c474397
🔨 clean up
2018-01-28 14:13:02 +01:00
Niels Lohmann
6855bbb902
🔨 split "parsing" directory to "input" and "output"
2018-01-28 13:15:03 +01:00
Niels Lohmann
05f49fa401
✅ added roundtrip tests for UBJSON
2018-01-27 18:47:32 +01:00
Niels Lohmann
f0b26c8f38
✅ added fuzzer for UBJSON input
2018-01-27 18:38:11 +01:00
Niels Lohmann
b0a68f540f
✅ added roundtrip tests for UBJSON
2018-01-27 18:37:55 +01:00
Niels Lohmann
1be3935e9d
📝 cleanup after #936
2018-01-27 17:43:44 +01:00
Niels Lohmann
7aace7c976
Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning
...
Removed compiler warning about unused variable 'kMinExp'
2018-01-27 16:51:52 +01:00
Niels Lohmann
0e2211df0e
Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd
...
Howto installation of json_fwd.hpp (fixes #923 )
2018-01-25 17:11:21 +01:00
zerodefect
95cf1fefaa
Removed compiler warning about unused variable 'kMinExp'.
2018-01-25 12:51:48 +00:00
Niels Lohmann
355c1e946b
👷 added task to check amalgamation #906
...
- Builds and runs test cases from individual sources rather than from amalgamation.
- Checks whether amalgamation would create the same single-header file as checked in.
2018-01-23 18:00:12 +01:00
Niels Lohmann
dbfd7e532b
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2018-01-23 16:33:10 +01:00
Niels Lohmann
3c68a796df
🔥 deprecated iterator_wrapper #874
...
Also fixed some warnings from GCC.
2018-01-23 16:33:08 +01:00
Niels Lohmann
f05c3edc21
Merge pull request #930 from Pipeliner/develop
...
Fix a typo in README.md
2018-01-23 07:32:23 +01:00
Niels Lohmann
f5c4e9f3a1
Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types
...
fix sfinae on basic_json UDT constructor
2018-01-23 07:32:06 +01:00
Niels Lohmann
7eabb6ba36
📝 updated documentation for UBJSON functions
2018-01-22 23:23:17 +01:00
Vadim Evard
fc32b8a9bc
Fix a typo in README.md
2018-01-22 13:14:39 +03:00
Niels Lohmann
3cca630836
🔨 cleanup after #915
2018-01-21 15:55:35 +01:00
Niels Lohmann
010e596001
Merge pull request #915 from abolz/dtoa
...
Floating-point formatting
2018-01-21 15:02:57 +01:00
Niels Lohmann
3d776b0582
📝 updated README
2018-01-21 14:13:42 +01:00
Niels Lohmann
9e5d901f55
Merge branch 'feature/ubjson' into develop
2018-01-21 14:04:29 +01:00
Niels Lohmann
327b8bb09e
Merge branch 'feature/strings' into develop
2018-01-21 13:55:52 +01:00
zerodefect
d2b3fd156e
Updated README.md to explain how installation of json_fwd.hpp can be achieved as part of install step.
2018-01-19 11:42:53 +00:00
Niels Lohmann
b406e3704b
➕ using Google Benchmark #921
2018-01-18 22:00:32 +01:00
Niels Lohmann
a8f711a2f1
➕ using Google Benchmark #921
2018-01-18 21:57:21 +01:00
Niels Lohmann
6402077ac2
Merge pull request #876 from nlohmann/feature/rfc7396
...
JSON Merge Patch (RFC 7396)
2018-01-18 06:49:31 +01:00
