External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,397 Commits 10 Branches 56 Tags 212 MiB
f6ceebc0ca
Commit Graph

192 Commits

Author SHA1 Message Date
Qianqian Fang
f6ceebc0ca fix ci error 2022-04-25 23:46:27 -04:00
Qianqian Fang
bc2f11d565 test write_bjdata_ndarray return value as boolean 2022-04-23 18:14:31 -04:00
Qianqian Fang
05adfcc3cd return bool for write_bjdata_ndarray 2022-04-23 16:56:15 -04:00
Qianqian Fang
33004bba6e fix ci static analysis error 2022-04-23 09:00:59 -04:00
Qianqian Fang
a3c4218345 fix ci clang gcc error 2022-04-23 09:00:59 -04:00
Qianqian Fang
f3ec3be0b2 move OutputIsLittleEndian from tparam to param to replace use_bjdata 2022-04-23 09:00:59 -04:00
Qianqian Fang
35936717c8 fix ci error 2022-04-23 09:00:59 -04:00
Qianqian Fang
2dc8f97ef5 disable [{SHTFNZ in optimized type due to security risks in #2793 and hampered readability 2022-04-23 09:00:59 -04:00
Qianqian Fang
09ab236cfe fix clang tidy error 2022-04-23 09:00:59 -04:00
Qianqian Fang
5786991973 polish patch to remove ci errors 2022-04-23 09:00:59 -04:00
Qianqian Fang
4c9dd311bd partially fix ci errors, add tests to improve coverage 2022-04-23 09:00:59 -04:00
Qianqian Fang
069b4d68f1 encode and decode bjdata ndarray in jdata annotations, enable roundtrip tests 2022-04-23 09:00:59 -04:00
Qianqian Fang
be6cdaa4b9 fix ci error, remove unwanted param comment 2022-04-23 09:00:59 -04:00
Qianqian Fang
45a7c365ee make use_bjdata a non-default parameter 2022-04-23 09:00:59 -04:00
Qianqian Fang
8083430a7a revert order to avoid msvc 2015 unreferenced formal param error 2022-04-23 09:00:12 -04:00
Qianqian Fang
8dd4a61ad6 pass use_bjdata via output adapter 2022-04-23 09:00:12 -04:00
Qianqian Fang
7589b604aa move is_bjdata to an optional param to write_ubjson 2022-04-23 09:00:12 -04:00
Qianqian Fang
53855c14d4 remove the unwanted assert 2022-04-23 09:00:12 -04:00
Qianqian Fang
29c7a4365f make is_bjdata const after using initializer list 2022-04-23 09:00:12 -04:00
Qianqian Fang
d5e590efe3 fix ci errors, add tests for new bjdata switch structure 2022-04-23 09:00:12 -04:00
Qianqian Fang
408144ae73 simplify endian condition, format unit-bjdata 2022-04-23 08:59:47 -04:00
Qianqian Fang
3d211b883d complete test coverage, fix ci_test errors 2022-04-23 08:59:47 -04:00
Qianqian Fang
4985323bb7 fix additional warnings and errors for clang and msvc 2022-04-23 08:59:29 -04:00
Qianqian Fang
58efde83f0 fix additional VS errors 2022-04-23 08:59:14 -04:00
Qianqian Fang
94b0268cc2 partially fix VS compilation errors 2022-04-23 08:59:14 -04:00
Qianqian Fang
3c820dd215 support UBJSON-derived Binary JData (BJData) format 2022-04-23 08:59:14 -04:00
Florian Albrechtskirchinger
616caea27a
Re-template json_pointer on string type (#3415) 
* Make exception context optional

Change exception context parameter to pointer and replace context with
nullptr where appropriate.

* Support escaping other string types

* Add string concatenation function

Add variadic concat() function for concatenating char *, char, and
string types.

* Replace string concatenations using + with concat()

* Template json_pointer on string type

Change json_pointer from being templated on basic_json to being
templated on string type.

* Add unit test for #3388

Closes #3388.

* Fix regression test for #2958

* Add backwards compatibility with json_pointer<basic_json>

* Update json_pointer docs

* Allow comparing different json_pointers

* Update version numbers
 2022-04-12 14:18:16 +02:00
Niels Lohmann
6d8d043add
♻️ make function static 2022-01-05 21:21:46 +01:00
Niels Lohmann
9e89c2fdb5
♻️ remove stringstream (#3244) 2022-01-04 09:25:41 +01:00
Niels Lohmann
1aca6cb949
Add build step for NVCC and fix a warning (#3227) 
* 👷 add step for NVCC build #2676
* 🚨 fix warning (code taken from #2736)
* 👷 use version 2.2.0 of the CI image
 2021-12-30 13:40:15 +01:00
Niels Lohmann
29cd970b94
Consolidate documentation (#3071) 
* 🔥 consolidate documentation
* ♻️ overwork std specializations
* 🚚 move images files to mkdocs
* ♻️ fix URLs
* 🔧 tweak MkDocs configuration
* 🔧 add namespaces
* 📝 document deprecations
* 📝 document documentation generation
* 🚸 improve search
* 🚸 add examples
* 🚧 start adding documentation for macros
* 📝 add note for https://github.com/nlohmann/json/issues/874#issuecomment-1001699139
* 📝 overwork example handling
* 📝 fix Markdown tables
 2021-12-29 13:41:01 +01:00
Niels Lohmann
6d3115924c
Add C++17 copies of the test binaries (#3101) 
* ⚗️ add C++17 copies of the test binaries
* ⚗️ use proper header for filesystem
* 🚨 fix warnings
* ⚗️ do not use too old compilers with C++17
* ✅ add test
* 🔨 add more constraints #3097
* ⚗️ use fix from https://github.com/nlohmann/json/pull/3101#issuecomment-998788786
* ⚗️ use fix from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
* 👷 use published CI image
 2021-12-29 09:47:05 +01:00
Alex Beregszaszi
834918018e
Fix spelling (#3125) 2021-11-09 14:46:58 +01:00
Niels Lohmann
7440786b81
Update CI (#3088) 
* 👷 prepare GitHub actions for new Docker image

* 👷 use experimental docker image

* 👷 use Clang-Analyzer 14

* 🔇 suppress readability-identifier-length

* 🔇 suppress more Clang-Tidy warnings

* ♻️ simplify code

* 🔇 suppress more Clang-Tidy warnings

* 🔇 suppress more Clang-Tidy warnings

* 🚨 fix warning

* 🚨 fix warning

* 🚨 fix warning

* 👷 use new Docker image
 2021-10-29 21:27:34 +02:00
Niels Lohmann
80cf9d7065
Revert invalid fix (#3082) 
* ⏪ revert invalid fix
 2021-10-16 13:27:28 +02:00
Niels Lohmann
0b345b20c8
Allow allocators for output_vector_adapter (#2989) 
* ♻️ allow allocators for vectors

* ✅ add regression tests
 2021-09-12 18:55:47 +02:00
Pierre Hallot
433604843d
Fix extra ";" clang warnings 2021-08-19 17:04:34 +02:00
Niels Lohmann
0a0eb7a850
Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 
 Conflicts:
	.github/workflows/windows.yml
 2021-08-14 11:19:48 +02:00
Ferry Huberts
e7a69b8d31 Adjust more files after actually building like the CI 
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
 2021-08-13 14:00:00 +02:00
Niels Lohmann
e20f3f95eb
🚨 guard GCC pragmas #2924 2021-08-11 23:55:46 +02:00
Niels Lohmann
8ae31a56a5
Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 2021-08-11 08:06:32 +02:00
Niels Lohmann
523f7c2c9d
💡 update documentation 2021-08-08 13:24:17 +02:00
Niels Lohmann
b7db1d68d9
♻️ fix CBOR and BSON 2021-08-06 14:36:38 +02:00
Niels Lohmann
046df035fa
♻️ change type of binary subtype 2021-08-06 13:45:35 +02:00
Sven Fink
095aae19fe Supress -Wfloat-equal on intended float comparisions 2021-08-03 08:58:38 +02:00
Niels Lohmann
c3df4ffd5a
🚨 fix warning 2021-08-01 14:08:14 +02:00
Niels Lohmann
996ac1c017
Merge branch 'develop' of https://github.com/nlohmann/json into issue2572 
 Conflicts:
	include/nlohmann/detail/output/serializer.hpp
	single_include/nlohmann/json.hpp
 2021-07-15 21:57:52 +02:00
David Pfahler
aa849a2275 Merge branch 'nlohmann:develop' into without-io 2021-06-14 08:22:49 +02:00
David Pfahler
ae9bbbc941 include io only if JSON_NO_IO is not set for #2728 2021-05-31 14:26:45 +02:00
David Pfahler
1a1381f071 Fixes #2728 
includes some macros to be defined for using without file io.
 2021-04-21 10:24:01 +02:00