haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-16 11:23:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
3529 commits 12 branches 56 tags 226 MiB
Commit graph

3529 commits

This branch
This branch
All branches
Author SHA1 Message Date
Miguel Magalhães 3df622a417
Update LICENSE.MIT 2020-03-25 17:24:23 +00:00
chenguoping e07686f0c7 update array_index() and add testcases 2020-03-25 15:57:20 +08:00
chenguoping 2e7d340dad docs:modify the document about operator== 2020-03-25 10:18:04 +08:00
garethsb-sony 7fe16f9400 PR for #2006 to test in AppVeyor. 2020-03-24 12:53:59 +00:00
chenguoping dcd3a6c62b move the catch of std::invalid_argument into array_index() 2020-03-23 17:24:47 +08:00
chenguoping 59cb4c93be fix C26451 warnning in serializer.hpp for VS2019 2020-03-23 16:08:47 +08:00
chenguoping 0a8216890d fix C26451 warnnings in to_chars.hpp 2020-03-23 15:27:35 +08:00
Alexander Myasnikov 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example 2020-03-21 18:34:40 +03:00
Sergey Linev 78e911b8c3
Use array_idx as methods args 
Avoid mix-up with array_index member

Co-Authored-By: Niels Lohmann <niels.lohmann@gmail.com>
 2020-03-19 11:52:40 +01:00
Niels Lohmann 19843b038c
Merge pull request #1933 from dota17/dota17-FAQ 
Update README.md : add a FAQ about memory release
 2020-03-19 11:25:47 +01:00
Niels Lohmann ebb5a4c09f
💰 add sponsor 2020-03-19 11:14:50 +01:00
chenguoping bfc003cadf catch exceptions for json_point : /xx/+99 2020-03-17 20:49:28 +08:00
chenguoping 2ccdfebaa7 fix typo 2020-03-14 18:10:55 +08:00
Niels Lohmann 54656ef279
Merge pull request #1956 from dota17/dota17-fix-typo 
Fix typo in examples
 2020-03-13 17:26:24 +01:00
Niels Lohmann d102da61ad
Merge pull request #1979 from alex-weej/patch-2 
README: Fix string representation of `dump`ed `json`
 2020-03-13 16:49:13 +01:00
Sergey Linev 00049c20d0 Rename argument array_index to array_indx in json_pointer methods 
Fixes gcc48 warning:

declaration of ‘array_index’ shadows a member of 'this' [-Wshadow]
 2020-03-11 07:41:53 +01:00
Alexander “weej” Jones 5fdb1d08aa
README: Fix string representation of dumped json 
As is it's confusing and inconsistent with the indented form right below. The backslash escapes make it confusing.
 2020-03-10 19:37:20 +00:00
Francois Chabot 41b0704ce1 removed move assignments from input adapters 2020-03-02 23:50:01 -05:00
Francois Chabot 7eadd6daef added back forward declaration to address warnings 2020-02-28 18:15:11 -05:00
dota17 699e0a923c fix typo in examples 2020-02-26 13:44:08 +08:00
Francois Chabot c7282d5b1e simpler endian detection for older gcc versions 2020-02-20 10:19:29 -05:00
Francois Chabot 770ae6e9da accomodate older gcc 2020-02-19 16:54:09 -05:00
Francois Chabot de35fad88e fixed missing return arg of operator=() 2020-02-19 15:23:49 -05:00
Francois Chabot 2e2cf02cfd duck-typed object input adapters 2020-02-19 14:59:31 -05:00
Francois Chabot a0c4fc945a fixed bad friend class declaration 2020-02-19 11:23:02 -05:00
Francois Chabot 617b3cf42e templated input adapters 2020-02-19 10:32:49 -05:00
Chen 42566c6bef
Update README.md 2020-02-17 15:40:52 +08:00
Niels Lohmann 61b46a56fb
🏗️ replace is_pod by is_trivial 2020-02-15 10:12:27 +01:00
Chen 88097a250f
Update README.md : add a FAQ about memory release 2020-02-10 21:03:57 +08:00
Niels Lohmann 973c52dd4a
Merge pull request #1923 from Coeur/typos 
Some typos
 2020-02-02 14:48:07 +01:00
Antoine Cœur 8d92ca865f Some typos 2020-02-02 17:29:37 +08:00
Niels Lohmann 6a6790ab68
Merge pull request #1917 from jothepro/update-links-to-hunter 
Readme: Updated links to hunter repo & docs
 2020-01-31 11:47:42 +01:00
Niels Lohmann 3eb6b0e7a2
Merge pull request #1918 from kastiglione/patch-1 
Fix link to parse function in README
 2020-01-31 11:46:53 +01:00
Dave Lee f25a1287f9
Fix link to parse function in README 2020-01-29 14:19:00 -08:00
jothepro 0257533866
Updated links to hunter repo & docs 
hunter was recently passed over to a new maintainer, this is why the github url & the link to the documentation have changed.
 2020-01-29 22:33:59 +01:00
Niels Lohmann 6ca5338a0c
Merge pull request #1909 from Klaim/patch-1 
Adds instruction for using Build2's package manager
 2020-01-28 19:00:45 +01:00
Joël Lamotte ab538ba523
Formatting 
(proper naming suggested by `build2`'s author)
 2020-01-21 17:49:23 +01:00
Joël Lamotte 708e107d8e
Adds instruction for using Build2's package manager 
I created a `nlohmann-json` package for `build2` (https://build2.org) that have been published on the central public repository https://cppget.org : https://cppget.org/nlohmann-json (at the moment you can see that there is only one version: 3.7.3).

The repository of the package code is there: https://github.com/build2-packaging/nlohmann-json and is owned by the build2 community now. (with build2 you can use either a repository like cppget.org or a git repository so both are useful to users for different use cases).

This patch just add the basic information as to how to use this library with build2.
 2020-01-20 14:50:15 +01:00
Niels Lohmann ad383f66bc
Merge pull request #1907 from pauljurczak/patch-1 
Update README.md
 2020-01-19 22:45:53 +01:00
Paul Jurczak bc95563814
Update README.md 2020-01-18 14:25:03 -07:00
Niels Lohmann 7acf6218b6
📝 fix typo #1903 2020-01-15 17:40:03 +01:00
Niels Lohmann 0feea6168d
📝 fix scanner documentation 2020-01-12 10:22:11 +01:00
Niels Lohmann bde5712418
Merge pull request #1871 from sonulohani/develop 
Fix warning: ignoring return value
 2019-12-16 15:06:47 +01:00
Sonu Lohani 4c1ebb4413
Fix warning: ignoring return value 2019-12-16 14:22:41 +05:30
Niels Lohmann b568619c4a
💰 add sponsor section 2019-12-15 19:26:51 +01:00
Niels Lohmann bccc8f0577
Merge pull request #1857 from gocarlos/develop 
docs: add central repository as conan source to readme
 2019-12-01 11:53:24 +01:00
Carlos Gomes Martinho ac9df48453
style: format readme 2019-12-01 10:23:24 +01:00
Carlos Gomes Martinho f44e8ac090
revert: adding conan badge 2019-12-01 10:22:48 +01:00
Carlos Gomes Martinho 134a5faa2b
docs: add central repository as conan source to readme 2019-11-29 13:49:53 +01:00
Niels Lohmann c3270ac734
Merge pull request #1853 from podsvirov/readme-msys2-package-rename 
README: Package in MSYS2 renamed to nlohmann-json
 2019-11-23 09:21:52 +01:00