Commit graph

j3d1/json

Fork 0

0feea6168d

📝 fix scanner documentation Niels Lohmann 2020-01-12 10:22:11 +01:00
bde5712418

Merge pull request #1871 from sonulohani/develop Niels Lohmann 2019-12-16 15:06:47 +01:00
4c1ebb4413

Fix warning: ignoring return value Sonu Lohani 2019-12-16 14:22:41 +05:30
b568619c4a

💰 add sponsor section Niels Lohmann 2019-12-15 19:26:51 +01:00
bccc8f0577

Merge pull request #1857 from gocarlos/develop Niels Lohmann 2019-12-01 11:53:24 +01:00
ac9df48453

style: format readme Carlos Gomes Martinho 2019-12-01 10:23:24 +01:00
f44e8ac090

revert: adding conan badge Carlos Gomes Martinho 2019-12-01 10:22:48 +01:00
134a5faa2b

docs: add central repository as conan source to readme Carlos Gomes Martinho 2019-11-29 13:49:53 +01:00
c3270ac734

Merge pull request #1853 from podsvirov/readme-msys2-package-rename Niels Lohmann 2019-11-23 09:21:52 +01:00
f586bc014f README: Package in MSYS2 renamed to nlohmann-json Konstantin Podsvirov 2019-11-23 05:02:20 +03:00
c0f52edbc3

📝 add badges Niels Lohmann 2019-11-22 21:17:31 +01:00
a4c01f3380

👥 add GitHub Sponsors Niels Lohmann 2019-11-22 20:58:44 +01:00
3f044dad81

📝 add Xocde 11.2.1 to CI list Niels Lohmann 2019-11-22 08:00:41 +01:00
28b1448508

👷 add Xcode 11.2.1 Niels Lohmann 2019-11-21 22:22:06 +01:00
7439cfe5c8

Merge pull request #1844 from Tridacnid/develop Niels Lohmann 2019-11-19 19:27:14 +01:00
b2bec943d1

Merge pull request #1846 from Mike-Bal/fix_warnings Niels Lohmann 2019-11-19 19:24:36 +01:00
25e0175bc3 Remove unnecessary warning suppressions in test cmake file Michael Balszun 2019-11-19 11:26:35 +01:00
5c045f7d0a Use correct accumulator type in binary_writer if size_t != ul Michael Balszun 2019-11-19 10:52:09 +01:00
fbb0bd7556 Update tests that generate CMake projects to use the CMAKE_CXX_COMPILER the main project was CMake'd with. Fixes #1747. Joe Burzinski 2019-11-18 21:45:14 -06:00
e7b3b40b5a

Merge branch 'release/3.7.3' into develop Niels Lohmann 2019-11-17 12:21:44 +01:00
456478b3c5

Merge branch 'release/3.7.3' Niels Lohmann 2019-11-17 12:21:32 +01:00
c5eafe74e8

🔖 set version to 3.7.3 Niels Lohmann 2019-11-17 12:09:12 +01:00
c6e1e26018

Merge pull request #1838 from nickaein/fix-quadratic-destruction Niels Lohmann 2019-11-15 07:02:12 +01:00
efa13c663d Reserve stack only for top-level items Isaac Nickaein 2019-11-13 15:23:08 +03:30
948f98cf4a Cleanups Isaac Nickaein 2019-11-12 22:24:11 +03:30
0f3ec003bb Remove harmful vector::reserve during destruction (#1837) Isaac Nickaein 2019-11-12 22:19:55 +03:30
be61ad1470

🎨 fix inconsistent operator style Niels Lohmann 2019-11-11 21:37:32 +01:00
411158d896

Merge branch 'release/3.7.2' into develop Niels Lohmann 2019-11-10 21:39:14 +01:00
5f09b502b6

Merge branch 'release/3.7.2' Niels Lohmann 2019-11-10 21:39:02 +01:00
56109eacd7

🔖 set version to 3.7.2 Niels Lohmann 2019-11-10 21:23:39 +01:00
7b0c50b9a5

🔨 add path Niels Lohmann 2019-11-10 19:09:48 +01:00
0a513a35cb

Merge pull request #1436 from nickaein/iterate-on-destruction Niels Lohmann 2019-11-10 11:57:06 +01:00
7e2445a0f4 Move deep JSON test to a separate unit-test Isaac Nickaein 2019-11-09 21:42:39 +03:30
68d0a7b246 Reduce depth in unit-test to avoid choking valgrind Isaac Nickaein 2019-11-09 21:19:12 +03:30
eec1974218 Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction Isaac Nickaein 2019-11-09 14:50:48 +03:30
67259d698f

Merge pull request #1830 from nlohmann/whitesource/configure Niels Lohmann 2019-11-08 14:04:27 +01:00
760076abca

Add .whitesource configuration file whitesource-bolt-for-github[bot] 2019-11-08 13:01:29 +00:00
1a9de88117

🚨 fix a linter warning Niels Lohmann 2019-11-07 08:00:21 +01:00
d98bf0278d

Merge branch 'release/3.7.1' into develop Niels Lohmann 2019-11-06 20:34:07 +01:00
43e4db6141

Merge branch 'release/3.7.1' Niels Lohmann 2019-11-06 20:33:52 +01:00
aacdc6bbe3

🔖 set version to 3.7.1 Niels Lohmann 2019-11-06 18:37:26 +01:00
0f6a58eeaf

👥 update contributors Niels Lohmann 2019-11-06 17:35:04 +01:00
1e9f16dff0

🚨 fix linter errors Niels Lohmann 2019-11-05 20:25:53 +01:00
c0ae88bf50

🚨 fix linter errors Niels Lohmann 2019-11-05 20:23:17 +01:00
62dada05ca

🐛 fix conversion to std::valarray Niels Lohmann 2019-11-05 19:28:00 +01:00
7bcaba0ca9

Merge pull request #1821 from AnthonyVH/develop Niels Lohmann 2019-11-05 19:15:54 +01:00
1ca6f2901b

Merge pull request #1826 from cbegue/develop Niels Lohmann 2019-11-05 19:14:37 +01:00
abccafa5c5

⬆️ upgrade Doctest to 2.3.5 Niels Lohmann 2019-11-05 19:11:54 +01:00
c4923e3d05 Merge remote-tracking branch 'upstream/develop' into develop Anthony VH 2019-11-04 20:50:43 +01:00
ec9647ae63 Moved test for #1647 regression to regressions file. Anthony VH 2019-11-04 20:45:24 +01:00
8b686b30eb Add restriction for tuple specialization of to_json Camille Bégué 2019-10-31 18:39:01 +01:00
3790bd9ae0

👷 add Xcode 10.2 Niels Lohmann 2019-11-04 06:22:39 +01:00
42e9ad32c6

🔨 remove full path Niels Lohmann 2019-11-03 21:49:22 +01:00
e779714dd8

👷 add Xcode 10.2 Niels Lohmann 2019-11-03 20:45:21 +01:00
bf2afaeee6

🔊 add version output Niels Lohmann 2019-11-03 20:27:07 +01:00
6a4cc29f01

📝 update examples Niels Lohmann 2019-11-03 19:40:38 +01:00
dfe53c36da

🚨 fix UBSAN warnings Niels Lohmann 2019-11-03 13:48:25 +01:00
0db1692f45

👥 update contributors Niels Lohmann 2019-11-02 10:24:06 +01:00
1307862b1d

Merge pull request #1694 from eli-schwartz/release-include-meson Niels Lohmann 2019-11-02 09:28:51 +01:00
4d1e4c6d93

Merge pull request #1780 from t-b/add-msvc-16-2019 Niels Lohmann 2019-11-02 08:16:53 +01:00
a1828bbf57

Merge pull request #1806 from cbegue/develop Niels Lohmann 2019-11-01 19:46:19 +01:00
794a3d411a Fix issue #1805 Camille Bégué 2019-10-21 17:50:15 +02:00
ddda67a096 Don't capture json input by value (fixed #1822). Anthony Van Herrewege 2019-10-30 16:16:34 +01:00
fb9a2643c8 Add test for #1647. Anthony Van Herrewege 2019-10-30 15:46:31 +01:00
27d0dfc17a Fix #1647: non-member operator== breaks enum (de)serialization. Anthony Van Herrewege 2019-10-30 14:54:52 +01:00
f272ad533d

👥 add CODEOWNERS file Niels Lohmann 2019-10-23 21:41:12 +02:00
f7e7a62358

📝 add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER Niels Lohmann 2019-10-23 20:58:06 +02:00
507d5676ad

🚨 fix warning Niels Lohmann 2019-10-23 20:57:10 +02:00
00cb98a3d1

Merge pull request #1803 from flopp/spelling Niels Lohmann 2019-10-21 20:50:13 +02:00
b93d414a35 Fix some spelling errors - mostly in comments & documentation. Florian Pigorsch 2019-10-19 11:59:46 +02:00
f4332d4097

README: describe how to use json as a meson subproject Eli Schwartz 2019-09-02 15:25:11 -04:00
84faa36ec5

release: add singleinclude and meson.build to include.zip Eli Schwartz 2019-07-31 15:43:31 -04:00
0245ae5157

Merge pull request #1797 from t-b/fix-integer-truncation Niels Lohmann 2019-10-17 21:02:48 +02:00
4c06191836

Merge pull request #1799 from nemequ/develop Niels Lohmann 2019-10-17 20:59:49 +02:00
fbcbc76d10 Update Hedley to v11. Evan Nemerson 2019-10-16 13:39:40 -07:00
c6cbdf96a9 appveyor.yml: Add debug build on x64 and VS 2019 Thomas Braun 2019-10-15 12:13:33 +02:00
01e486bb55 appveyor.yml: Add MSVC 16 2019 support Thomas Braun 2019-10-07 21:36:55 +02:00
35b47c2793 iteration_proxy: Fix integer truncation from std::size_t to int Thomas Braun 2019-10-16 20:00:05 +02:00
5541a2bd25 test/cmake_import: Pass the generator platform required by MSVC 2019 Thomas Braun 2019-10-15 22:36:54 +02:00
7a521150aa appveyor: Pass the generator platform explicitly Thomas Braun 2019-10-12 15:03:34 +02:00
ed5541440a

Merge pull request #1779 from t-b/avoid-using-glob-in-cmake Niels Lohmann 2019-10-09 07:37:43 +02:00
eb6fe421ae test/CMakeLists.txt: Use an explicit list instead of GLOB Thomas Braun 2019-10-07 21:13:09 +02:00
d187488e0d

Merge pull request #1765 from crazyjul/fix/items-with-alt-string Niels Lohmann 2019-10-05 22:11:14 +02:00
dae0fe79af

Merge pull request #1769 from chris0x44/json_pointer Niels Lohmann 2019-10-03 10:35:34 +02:00
d826282f53

Merge pull request #1767 from 0xflotus/patch-1 Niels Lohmann 2019-10-01 11:32:05 +02:00
4615f5a980 Provide default implementation for int_to_string, but allow for overloaded function Julien Hamaide 2019-10-01 10:34:21 +02:00
7476f5ee0c Make json_pointer::back const (resolves #1764) christian 2019-10-01 00:57:27 +02:00
d7579b8cbf

did you mean 'serialization'? 0xflotus 2019-09-30 18:11:44 +02:00
0f073e26eb Allow items() to be used with custom string Julien Hamaide 2019-09-26 13:13:01 +02:00
99d7518d21

📝 add OSS Fuzz status badge Niels Lohmann 2019-09-24 21:01:06 +02:00
e2c531a1f7

Merge pull request #1760 from Xav83/cppcheckFixes Niels Lohmann 2019-09-24 20:42:38 +02:00
87afee1c39 Runs make amalgamate on the project. Xav83 2019-09-19 19:25:39 +02:00
13a7c60257 Correct a warning from cppcheck: Xav83 2019-09-19 17:58:41 +02:00
b9dfdbe6be Correct a warning from cppcheck: Xav83 2019-09-19 17:46:10 +02:00
771d5dadc6

Merge pull request #1741 from tete17/Fix-SFINAE Niels Lohmann 2019-09-16 22:39:42 +02:00
cade804c1a make CMake's version config file architecture-independent Hubert Chathi 2019-09-10 23:41:38 -04:00
e26a2904fc Fix and add test's for SFINAE problem Miguel Sacristan 2019-09-07 17:36:24 +02:00
06ccd43a2a

Merge pull request #1722 from t-b/fix-int64-min-issue Niels Lohmann 2019-09-10 07:58:02 +02:00
a6bd798bfa

Merge pull request #1728 from t-b/fix-clang-sanitizer-invocation Niels Lohmann 2019-09-10 07:50:02 +02:00
8067c3ca5b Add serialization unit tests for extreme integer values Thomas Braun 2019-08-25 22:02:49 +02:00