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
Konstantin Podsvirov
f586bc014f
README: Package in MSYS2 renamed to nlohmann-json
...
This is done to correctly match with the
corresponding package in Archlinux.
2019-11-23 05:02:20 +03:00
Niels Lohmann
c0f52edbc3
📝 add badges
2019-11-22 21:17:31 +01:00
Niels Lohmann
a4c01f3380
👥 add GitHub Sponsors
2019-11-22 20:58:44 +01:00
Niels Lohmann
3f044dad81
📝 add Xocde 11.2.1 to CI list
2019-11-22 08:00:41 +01:00
Niels Lohmann
28b1448508
👷 add Xcode 11.2.1
...
https://twitter.com/travisci/status/1197625080119021568
2019-11-21 22:22:06 +01:00
Niels Lohmann
7439cfe5c8
Merge pull request #1844 from Tridacnid/develop
...
Update tests that generate CMake projects to use main project's C++ compiler
2019-11-19 19:27:14 +01:00
Niels Lohmann
b2bec943d1
Merge pull request #1846 from Mike-Bal/fix_warnings
...
Fix msvc warnings
2019-11-19 19:24:36 +01:00
Michael Balszun
25e0175bc3
Remove unnecessary warning suppressions in test cmake file
2019-11-19 11:26:35 +01:00
Michael Balszun
5c045f7d0a
Use correct accumulator type in binary_writer if size_t != ul
...
- Also fixes warning in msvc about possible loss of data in
that size computation.
2019-11-19 11:06:45 +01:00
Joe Burzinski
fbb0bd7556
Update tests that generate CMake projects to use the CMAKE_CXX_COMPILER the main project was CMake'd with. Fixes #1747 .
2019-11-18 21:46:34 -06:00
Niels Lohmann
e7b3b40b5a
Merge branch 'release/3.7.3' into develop
2019-11-17 12:21:44 +01:00
Niels Lohmann
c5eafe74e8
🔖 set version to 3.7.3
2019-11-17 12:09:12 +01:00
Niels Lohmann
c6e1e26018
Merge pull request #1838 from nickaein/fix-quadratic-destruction
...
Fix quadratic destruction complexity
2019-11-15 07:02:12 +01:00
Isaac Nickaein
efa13c663d
Reserve stack only for top-level items
2019-11-13 15:23:08 +03:30
Isaac Nickaein
948f98cf4a
Cleanups
...
Make our intent more clear in destruction
2019-11-12 22:24:11 +03:30
Isaac Nickaein
0f3ec003bb
Remove harmful vector::reserve during destruction ( #1837 )
2019-11-12 22:22:55 +03:30
Niels Lohmann
be61ad1470
🎨 fix inconsistent operator style
2019-11-11 21:37:32 +01:00
Niels Lohmann
411158d896
Merge branch 'release/3.7.2' into develop
2019-11-10 21:39:14 +01:00
Niels Lohmann
56109eacd7
🔖 set version to 3.7.2
2019-11-10 21:23:39 +01:00
Niels Lohmann
7b0c50b9a5
🔨 add path
2019-11-10 19:09:48 +01:00
Niels Lohmann
0a513a35cb
Merge pull request #1436 from nickaein/iterate-on-destruction
...
Prevent stackoverflow caused by recursive deconstruction
2019-11-10 11:57:06 +01:00
Isaac Nickaein
7e2445a0f4
Move deep JSON test to a separate unit-test
2019-11-09 21:42:39 +03:30
Isaac Nickaein
68d0a7b246
Reduce depth in unit-test to avoid choking valgrind
2019-11-09 21:19:12 +03:30
Isaac Nickaein
eec1974218
Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction
2019-11-09 14:50:48 +03:30
Niels Lohmann
67259d698f
Merge pull request #1830 from nlohmann/whitesource/configure
...
Configure WhiteSource Bolt for GitHub
2019-11-08 14:04:27 +01:00
whitesource-bolt-for-github[bot]
760076abca
Add .whitesource configuration file
2019-11-08 13:01:29 +00:00
Niels Lohmann
1a9de88117
🚨 fix a linter warning
...
Coverity detected two "Memory - illegal accesses (OVERRUN)" issues. Resizing the buffer should silence this warning.
2019-11-07 08:00:21 +01:00
Niels Lohmann
d98bf0278d
Merge branch 'release/3.7.1' into develop
2019-11-06 20:34:07 +01:00
Niels Lohmann
aacdc6bbe3
🔖 set version to 3.7.1
2019-11-06 18:37:26 +01:00
Niels Lohmann
0f6a58eeaf
👥 update contributors
2019-11-06 17:35:04 +01:00
