haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,398 Commits
16 Branches
56 Tags
222 MiB
Commit Graph

2398 Commits (8b457ace2533f92af1de132ad12ec0e579306c47)

Author SHA1 Message Date
Niels Lohmann 8b457ace25
🐛 fixing CBOR's indefinity length strings #961 
Beside the fix discussed in #961, we also had to re-adjust a test case. It seems that it was failing before, and I "fixed" it to work with the broken implementation...
 2018-02-06 20:43:03 +01:00
Niels Lohmann 556e30f759
Merge pull request #955 from patrikhuber/patch-1 
Fix links in README.md
 2018-02-06 20:18:14 +01:00
Patrik Huber ee76436592
Change to angle brackets 2018-02-06 11:29:37 +00:00
Niels Lohmann 737cffe0cb
🔨 fixed directory for lcov coverage 2018-02-04 20:58:50 +01:00
Patrik Huber ae688016f6
Changed links from master to develop branch 2018-02-04 12:41:46 +00:00
Niels Lohmann 2b7b39c72d
🚀 added release target #956 2018-02-04 13:29:23 +01:00
Patrik Huber 44b40d7c6a
Fix links in README.md 2018-02-03 15:48:02 +00:00
Niels Lohmann 3a887dc9fe
👷 fixed coveralls 2018-02-02 07:56:30 +01:00
Niels Lohmann 5c2a0a511e
👷 fixed coveralls 2018-02-02 07:31:57 +01: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