Niels Lohmann
59bce783be
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
2021-12-28 22:53:03 +01:00
Maarten Becker
825d3230d1
Fix: Warning for shadowed variables ( #3188 ) ( #3193 )
...
* Rename variable count to resolve shadowing (#3188 )
* Amalgamate: Rename variable count to resolve shadowing (#3188 )
Co-authored-by: Maarten Becker <maarten.becker@nuc-eng.com>
2021-12-17 07:24:59 +01:00
Niels Lohmann
0a5b16f165
🚧 start adding documentation for macros
2021-11-20 11:21:21 +01:00
Prince Mendiratta
760304635d
Fix FAQ hyperlink typo in readme ( #3148 )
...
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
2021-11-18 11:58:49 +01:00
Daniel Albuschat
ee1208aa60
Docs: Update skip_comments to ignore_comments ( #3145 )
...
In the docs, the `ignore_comments` parameter to `nlohmann::json::parse()` is described as `skip_comments`, which does not match the actual implementation. While the demo code compiles and works, the parameter name is wrong.
2021-11-17 19:21:54 +01:00
Niels Lohmann
bb0d6d1a9c
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
2021-11-14 14:34:22 +01:00
Dirk Stolle
fe230334d9
fix typos in documentation ( #3140 )
...
* fix typos in documentation
* revert changes to ChangeLog.md
2021-11-14 14:25:14 +01:00
Niels Lohmann
d1f84e81e9
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
...
Conflicts:
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
2021-11-13 14:31:42 +01:00
Niels Lohmann
e9f88c2fad
Add missing erase(first, last) function to ordered_map ( #3109 )
2021-11-09 22:24:58 +01:00
Alex Beregszaszi
834918018e
Fix spelling ( #3125 )
2021-11-09 14:46:58 +01:00
Niels Lohmann
b9a4a4809c
🚸 add examples
2021-11-07 22:07:16 +01:00
Niels Lohmann
9bc244be47
🚨 fix warnings
2021-11-07 21:36:23 +01:00
Niels Lohmann
0f6f08654f
🚸 add examples
2021-11-07 20:58:52 +01:00
Niels Lohmann
70290265cd
🚸 improve search
2021-11-07 20:17:17 +01:00
Niels Lohmann
e324936b56
📝 document documentation generation
2021-11-07 20:17:01 +01:00
Niels Lohmann
eae2613c68
📝 document deprecations
2021-11-07 20:16:45 +01:00
Niels Lohmann
e97c93f451
🔧 add namespaces
2021-11-07 13:13:37 +01:00
Niels Lohmann
5a5073dd2b
🔧 tweak MkDocs configuration
2021-11-06 22:36:25 +01:00
Niels Lohmann
0b263259e2
🔥 consolidate documentation
2021-11-06 15:37:40 +01:00
Niels Lohmann
d452be4d21
🔥 consolidate documentation
2021-11-05 23:29:15 +01:00
Niels Lohmann
7ea83ca417
🔥 consolidate documentation
2021-11-05 22:10:17 +01:00
Niels Lohmann
cec1bd8476
♻️ fix URLs
2021-11-05 21:46:15 +01:00
Niels Lohmann
eff06842f0
🔥 consolidate documentation
2021-11-05 21:43:46 +01:00
Niels Lohmann
96e5347c04
🚚 move images files to mkdocs
2021-11-05 20:24:38 +01:00
Niels Lohmann
00ab9e5ccc
🚚 move images files to mkdocs
2021-11-05 20:24:34 +01:00
Niels Lohmann
41bc172653
🚚 move images files to mkdocs
2021-11-05 20:24:06 +01:00
Niels Lohmann
e624c8941d
🔥 consolidate documentation
2021-11-05 15:11:05 +01:00
Niels Lohmann
09da90eb76
🚨 fix linter warnings
2021-11-05 14:48:28 +01:00
Niels Lohmann
d54fd35355
🚨 fix linter warnings
2021-11-05 14:26:19 +01:00
Niels Lohmann
df7b521fcd
♻️ rename subpages
2021-11-05 13:41:52 +01:00
Niels Lohmann
7bfe76848a
🔥 consolidate documentation
2021-11-05 13:33:21 +01:00
Niels Lohmann
0d06b5d5e7
🔥 consolidate documentation
2021-11-04 22:36:11 +01:00
Niels Lohmann
c353461f83
🔥 consolidate documentation
2021-11-04 22:10:12 +01:00
Niels Lohmann
54b05a2672
🔥 consolidate documentation
2021-11-04 22:02:48 +01:00
Niels Lohmann
be17f1d366
✏️ fix typos
2021-11-04 20:39:47 +01:00
Niels Lohmann
544a8888aa
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
2021-11-04 19:14:03 +01:00
Niels Lohmann
5c08a52fd6
♻️ overwork std specializations ( #3121 )
2021-11-04 16:38:40 +01:00
Niels Lohmann
5534a77221
🔥 consolidate documentation
2021-11-04 14:26:05 +01:00
Niels Lohmann
4bf03fd8e7
🚨 suppress cert-dcl58-cpp
2021-11-03 22:27:41 +01:00
Niels Lohmann
dceb9b2493
♻️ overwork std specializations
2021-11-03 22:00:39 +01:00
Niels Lohmann
04d2020ea8
🚨 fix -fpermissive warnings
2021-11-03 21:25:51 +01:00
Niels Lohmann
5663bfa6c6
🚨 fix -fpermissive warnings
2021-11-03 21:25:46 +01:00
Niels Lohmann
2e66720982
🚨 add namespace comment
2021-11-03 20:54:15 +01:00
Niels Lohmann
b62f82e664
💚 fix build
2021-11-03 20:41:16 +01:00
Niels Lohmann
42c37d9c01
♻️ overwork std specializations
2021-11-03 15:20:44 +01:00
Niels Lohmann
ca5ecc2945
🔥 consolidate documentation
2021-11-03 14:51:19 +01:00
Niels Lohmann
cc218b7e80
💚 fix build
2021-11-03 14:16:54 +01:00
Niels Lohmann
561fe8959c
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
...
Conflicts:
include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
2021-11-03 13:58:08 +01:00
Niels Lohmann
5d87c4d409
Add recursive update function ( #3069 )
...
* ✨ add recursive update function
2021-11-03 13:52:20 +01:00
Niels Lohmann
dee9c8c4db
🔥 consolidate documentation
2021-11-01 22:28:53 +01:00
