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

3835 Commits (b3e5cb7f20dcc5c806e418df34324eca60d17d4e)

Author SHA1 Message Date
Niels Lohmann b3e5cb7f20
🔖 set version to 3.9.1 2020-08-06 13:45:29 +02:00
Niels Lohmann f4155e4727
Merge pull request #2333 from nlohmann/fallthrough 
Fix fallthrough warning
 2020-08-01 15:32:21 +02:00
Niels Lohmann 8a54617240
Merge pull request #2332 from nlohmann/issue2330 
Fix lexer to properly cope with repeated comments
 2020-08-01 12:29:33 +02:00
Niels Lohmann 0326e4e2a6
🚨 fix fallthrough warning 2020-07-31 19:24:03 +02:00
Niels Lohmann 3888b1642a
🐛 fix lexer to properly cope with repeated comments #2330 2020-07-31 18:59:22 +02:00
Niels Lohmann 1da931730a
Merge pull request #2327 from nlohmann/issue2326 
Fix name of Homebrew formula in documentation
 2020-07-31 08:00:08 +02:00
Niels Lohmann 1eedee5e4e
Merge pull request #2319 from nlohmann/issue2315 
Fix a bug due to missing overloads in ordered_map container
 2020-07-31 07:59:18 +02:00
Niels Lohmann 501ad6fc59
📝 fix name of Homebrew formula #2326 2020-07-30 13:31:00 +02:00
Niels Lohmann 35daa5c00b
Merge pull request #2320 from wx257osn2/fix-typo 
fix typo
 2020-07-30 12:27:16 +02:00
Niels Lohmann 2326abc547
♻️ split regression tests 2020-07-30 12:13:05 +02:00
Niels Lohmann f13af83a94
🐛 add more functions from std::map to nlohmann::ordered_map 2020-07-28 21:47:06 +02:00
I 2d3fe9d135 fix typo 2020-07-28 21:54:53 +09:00
Niels Lohmann e590604822
🐛 fix a bug due to missing overloads in ordered_map container 2020-07-28 14:20:31 +02:00
Niels Lohmann 1b8efed06f
Merge pull request #2318 from eli-schwartz/installfix 
cmake: install pkg-config file relative to current_binary_dir
 2020-07-28 13:25:04 +02:00
Niels Lohmann 7d01a9e875
Merge branch 'develop' into installfix 2020-07-28 13:24:54 +02:00
Niels Lohmann b3da8b325a
Merge pull request #2314 from xvitaly/fix-path 
Fixed installation of pkg-config file on other than Ubuntu
 2020-07-28 13:24:08 +02:00
Eli Schwartz aa06a4761e
cmake: install pkg-config file relative to current_binary_dir 
When the testsuite is enabled, the "cmake_add_subdirectory" test
adds a second copy of the project into the build configuration, and the
project files are installed twice.

This becomes super problematic when it tries to install a file from
CMAKE_BINARY_DIR which is only available in CMAKE_CURRENT_BINARY_DIR
and bombs out with the following error message:

```
[...]
-- Installing: <DESTDIR>/usr/lib/cmake/nlohmann_json/nlohmann_jsonTargets.cmake
CMake Error at test/cmake_add_subdirectory/nlohmann_json/cmake_install.cmake:73 (file):
  file INSTALL cannot find
  "......./nlohmann-json/builddir/test/cmake_add_subdirectory/nlohmann_json.pc":
  No such file or directory.
Call Stack (most recent call first):
  test/cmake_add_subdirectory/cmake_install.cmake:47 (include)
  test/cmake_install.cmake:49 (include)
  cmake_install.cmake:94 (include)
```
 2020-07-27 18:15:18 -04:00
Vitaly Zaitsev 8f9dc7eabe
Fixed installation of pkg-config file on other than Ubuntu 
distributions.

Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>
 2020-07-27 16:54:16 +02:00
Niels Lohmann d34771cafc
Merge branch 'release/3.9.0' into develop 2020-07-27 15:54:39 +02:00
Niels Lohmann e110667d21
🔖 set version to 3.9.0 2020-07-27 15:48:09 +02:00
Niels Lohmann c006fc9bec
📝 add more documentation 2020-07-27 14:07:13 +02:00
Niels Lohmann 84c0c76849
🚧 add Clang-Tidy configuration 2020-07-27 09:15:57 +02:00
Niels Lohmann 2f05f5175c
🚧 add Clang-Tidy configuration 2020-07-26 22:38:14 +02:00
Niels Lohmann 1b06184f22
👥 update list of contributors 2020-07-26 20:50:04 +02:00
Niels Lohmann 84a899f511
👥 update list of contributors 2020-07-26 14:54:51 +02:00
Niels Lohmann 7a4841a42a
📝 add binary() function to SAX documentation 2020-07-26 14:40:46 +02:00
Niels Lohmann bbcdf18ba5
🚚 move test utils header file 2020-07-26 14:07:34 +02:00
Niels Lohmann e22cbacc41
🚨 fix warning 2020-07-26 12:12:17 +02:00
Niels Lohmann 67ed63b196
Merge pull request #2312 from nlohmann/docs 
Update documentation
 2020-07-26 10:06:01 +02:00
Niels Lohmann a34070d36a
✅ fix test for meta() function 2020-07-25 22:28:14 +02:00
Niels Lohmann 9c75c7eace
🔧 clean generated XML files 2020-07-25 22:04:42 +02:00
Niels Lohmann 7bd6242f04
📝 add more documentation 2020-07-25 22:00:28 +02:00
Niels Lohmann 808aca41aa
Merge pull request #2305 from AODQ/develop 
fixes unused variable 'ex' for #2304
 2020-07-25 21:51:54 +02:00
Niels Lohmann 63e7c40e35
Merge pull request #2297 from nlohmann/issue2286 
Add support for high-precision numbers in UBJSON encoding
 2020-07-25 21:50:53 +02:00
Niels Lohmann 1816aae862
Merge branch 'develop' of https://github.com/nlohmann/json into docs 2020-07-25 21:48:51 +02:00
Niels Lohmann 980f8c6f61
🔀 merge develop branch 2020-07-25 21:45:47 +02:00
Niels Lohmann 42f8708940
Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-25 21:44:58 +02:00
Niels Lohmann 40b78d3847
Merge pull request #2308 from nlohmann/cbor_tags 
Fix bug in CBOR tag handling
 2020-07-25 19:43:11 +02:00
Niels Lohmann fad14aabe7
📝 update output of meta function 2020-07-25 14:41:06 +02:00
Niels Lohmann 6e5be17b62
📝 add more documentation 2020-07-25 14:40:50 +02:00
Niels Lohmann 62f98b7537
Merge branch 'develop' of https://github.com/nlohmann/json into docs 2020-07-25 11:20:13 +02:00
Niels Lohmann a1dbfcd736
Merge pull request #2306 from jwittbrodt/develop 
added inline to NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE macro
 2020-07-25 10:52:56 +02:00
Niels Lohmann c00c3162b2
Merge branch 'develop' into develop 2020-07-25 10:52:42 +02:00
Niels Lohmann 448ceb2e12
Merge pull request #2303 from nlohmann/cleanup 
Cleanup
 2020-07-25 05:41:51 +02:00
aodq 15ec0fe150 change c-style cast to static_cast for #2304 2020-07-24 16:21:30 -04:00
Niels Lohmann 58167173a2
📝 add more documentation 2020-07-24 15:25:53 +02:00
Niels Lohmann d8d499ce9b
📝 add more documentation 2020-07-24 14:35:52 +02:00
Niels Lohmann 480ad529e3
🐛 fix bug in CBOR tag handling 2020-07-24 14:18:39 +02:00
Niels Lohmann a84370c61f
📝 add more documentation 2020-07-24 14:04:58 +02:00
Niels Lohmann 33662417c1
✅ improve coverage 2020-07-24 09:32:03 +02:00