j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3419 commits 1 branch 0 tags 274 MiB
Commit graph

3419 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann
421a084396
✨ add convenience function to create binary value with given subtype 2020-05-06 21:23:45 +02:00
Niels Lohmann
2b39efd545
✅ add tests for binary type 2020-05-05 12:59:57 +02:00
Niels Lohmann
6dee8866a8
🐛 fix binary comparison 2020-05-05 12:40:04 +02:00
Niels Lohmann
908941b87d
✅ fix test cases 2020-05-05 07:47:20 +02:00
Niels Lohmann
2a34f4cd63
✅ add tests for binary type 2020-05-04 22:07:50 +02:00
Niels Lohmann
48aa441661
✨ add swap function for binary type 2020-05-04 22:07:36 +02:00
Niels Lohmann
a50a14088c
Merge pull request #2081 from nlohmann/external_test_data 
Use external test data
 2020-05-04 20:58:02 +02:00
Niels Lohmann
2304629a3f
📌 use JSON test data v1.0.0 2020-05-04 16:00:00 +02:00
Niels Lohmann
e7a88b2d7f
💚 fix AppVeyor and Travis builds 2020-05-03 19:33:01 +02:00
Niels Lohmann
634fa87e5a
Merge pull request #2080 from nlohmann/remove_doozer 
Remove Doozer CI
 2020-05-03 13:58:29 +02:00
Niels Lohmann
24237af983
🎨 fix format 2020-05-03 13:40:23 +02:00
Niels Lohmann
2f0d37d7d2
🔥 remove fastcov 2020-05-02 23:48:11 +02:00
Niels Lohmann
9c0c58d948
🔥 remove Doozer CI 2020-05-02 23:41:28 +02:00
Niels Lohmann
929f5d398c
🔨 fix coverage tests 2020-05-02 23:24:21 +02:00
Niels Lohmann
752c62b4bd
🔨 remove double tests 2020-05-02 16:07:09 +02:00
Niels Lohmann
f0050c9ba0
Merge pull request #2019 from dota17/contains_v2 
fix #1982:json_pointer.contains() exception is incorrectly raised
 2020-05-02 11:04:57 +02:00
Niels Lohmann
bec554936c
🔨 fix paths 2020-05-02 10:56:01 +02:00
Niels Lohmann
08c9472184
🔨 simplify workflow 2020-05-01 21:06:41 +02:00
Niels Lohmann
3ae7237f5a
🔨 clean up 2020-05-01 21:01:47 +02:00
Niels Lohmann
cfb2f34ebb
🔨 fix benchmarks 2020-05-01 20:59:47 +02:00
Niels Lohmann
d0ef591ce2
Merge branches 'develop' and 'external_test_data' of https://github.com/nlohmann/json into external_test_data 2020-05-01 20:23:08 +02:00
Niels Lohmann
ec5cfdd307
🔨 properly find and use Git 2020-05-01 16:18:04 +02:00
Niels Lohmann
d144459f1e
➕ add git 2020-05-01 16:14:13 +02:00
Niels Lohmann
f58383b8ee
🔊 output on failure 2020-05-01 15:22:18 +02:00
Niels Lohmann
7ade3a0efb
➖ remove dependency to FetchContent 2020-05-01 15:14:37 +02:00
Niels Lohmann
dbf1a1f413
♻️ download test data from external repository 2020-05-01 14:32:37 +02:00
Niels Lohmann
2251741b53
Merge pull request #2077 from ArthurSonzogni/develop-2 
Fix README.md. Missing ```
 2020-05-01 14:08:59 +02:00
ArthurSonzogni
f26689e006 Fix README.md 
About pull request:
https://github.com/nlohmann/json/pull/2074

An error has been introduced by accepting the suggestions:
4be4a038cc

One was about removing ~~~, but it was meant to be replaced by ``` in
reality. This caused the README.md to be slightly broken.
 2020-05-01 13:55:24 +02:00
Niels Lohmann
798dbb5c19
📝 add detail 2020-05-01 13:19:49 +02:00
Niels Lohmann
c9f404dc98
Merge pull request #2076 from rmisev/patch-1 
Fix error message about invalid surrogate pairs
 2020-05-01 12:47:39 +02:00
Niels Lohmann
b27d8a3253
Merge pull request #2074 from ArthurSonzogni/develop 
Add CMake fetchcontent documentation and tests
 2020-05-01 12:42:29 +02:00
Rimas Misevičius
6f1800889a Fix tests 2020-05-01 00:59:12 +03:00
Rimas Misevičius
4c053e3ec9 Fix tests 2020-05-01 00:48:24 +03:00
Rimas Misevičius
6815968a42 Fix error message about invalid surrogate pairs 
I tested following strings with invalid surrogate pair and unpaired surrogate in files:

1. `"a\uD800\uD800x"`
2. `"a\uD800x"`

The error messge was: "... invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; ..."

I think it must be: "... invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; ..."
 2020-05-01 00:23:04 +03:00
Arthur Sonzogni
4be4a038cc
Apply suggestions from code review 
Co-Authored-By: Niels Lohmann <niels.lohmann@gmail.com>
 2020-04-29 21:08:39 +02:00
Niels Lohmann
db013c9428
Merge pull request #2071 from nlohmann/issue2067 
Properly pass serialize_binary to dump function
 2020-04-29 19:39:58 +02:00
ArthurSonzogni
c331706644 Add CMake fetchcontent documentation and tests 
Github issue:
https://github.com/nlohmann/json/issues/2073

nlohmann::json documents 2 way of depending on it using CMake
1) Copy-paste the project/source into your own project.
2) Install nlohman::json and then use find_package.

(1) pollutes your git repository, (2) requires everyone to install the
dependencies themselves.

Since 2018, CMake provide some kind of 'package manager' features using
[FetchContent](https://cmake.org/cmake/help/v3.17/module/FetchContent.html)
It gives the following:
~~~cmake
include(FetchContent)

FetchContent_Declare(json
  GIT_REPOSITORY https://github.com/nlohmann/json
  GIT_TAG v3.7.3)

FetchContent_GetProperties(json)
if(NOT json_POPULATED)
  FetchContent_Populate(json)
  add_subdirectory( ${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
~~~

Then declares the dependency in the target using it:
~~~cmake
target_link_library(my_project PRIVATE nlohmann_json::nlohmann_json
~~~

This patch updates the documentation and provides tests.
 2020-04-29 18:28:06 +02:00
Niels Lohmann
b1fe6ee0d1
Merge pull request #2069 from nlohmann/issue2064 
Fix returning reference to local temporary object
 2020-04-28 20:56:48 +02:00
Niels Lohmann
2e5727d778
🐛 properly pass serialize_binary to dump function #2067 2020-04-27 15:10:23 +02:00
Niels Lohmann
9e0180b698
🐛 fix returning reference to local temporary object #2064 2020-04-27 14:43:49 +02:00
Niels Lohmann
d9d1279a94
Merge pull request #2060 from alexandermyasnikov/develop 
updated wandbox link
 2020-04-24 09:18:23 +02:00
Alexander Myasnikov
b01bc05b2b
updated wandbox link 2020-04-23 13:32:42 +03:00
Niels Lohmann
63afc8e3f8
Merge pull request #2043 from dota17/unit-constructor1 
Add missing testcase about NaN in unit-constructor1.cpp
 2020-04-21 07:35:44 +02:00
Niels Lohmann
a29e3b1318
Merge pull request #2054 from nlohmann/feature/issue1983 
Fix bug in diff function
 2020-04-20 19:44:35 +02:00
Niels Lohmann
c0a39b22a6
🚨 fix compiler warning 2020-04-20 19:42:58 +02:00
chenguoping
8bfc692602 update condition 2020-04-20 16:00:55 +08:00
Niels Lohmann
3607687a14
Merge pull request #2053 from nlohmann/gcc10warnings 
Fix GCC compiler warnings
 2020-04-20 08:05:42 +02:00
Niels Lohmann
721a1a0b5d
Merge pull request #2051 from nlohmann/clang10warnings 
Fix Clang compiler warnings
 2020-04-20 08:04:23 +02:00
Niels Lohmann
f14a7d8af7
Merge pull request #2050 from nlohmann/doctest_update 
Update doctest to 2.3.7
 2020-04-20 08:02:58 +02:00
chenguoping
c379d02b3e Add missing testcase about NaN in unit-constructor1.cpp 2020-04-20 10:25:44 +08:00