garethsb-sony
7fe16f9400
PR for #2006 to test in AppVeyor.
2020-03-24 12:53:59 +00:00
Antoine Cœur
8d92ca865f
Some typos
2020-02-02 17:29:37 +08:00
Niels Lohmann
c5eafe74e8
🔖 set version to 3.7.3
2019-11-17 12:09: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
56109eacd7
🔖 set version to 3.7.2
2019-11-10 21:23:39 +01:00
Isaac Nickaein
eec1974218
Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction
2019-11-09 14:50:48 +03:30
Niels Lohmann
aacdc6bbe3
🔖 set version to 3.7.1
2019-11-06 18:37:26 +01:00
Anthony Van Herrewege
27d0dfc17a
Fix #1647 : non-member operator== breaks enum (de)serialization.
2019-10-30 14:54:52 +01:00
Florian Pigorsch
b93d414a35
Fix some spelling errors - mostly in comments & documentation.
...
I did not touch the Changelog file and any third party stuff.
additonal -> additional (1)
apppend -> append (2)
constuctor -> constructor (2)
contect -> context (2)
dobulequote -> doublequote (1)
elemnts -> elements (1)
exakt -> exact (2)
exluded -> exclude (1)
explicitely -> explicitly (2)
narcissic -> narcissistic (1)
ocurred -> occurred (1)
occuring -> occurring (2)
preceeds -> preceded (1)
ot -> to (2)
wehther -> whether (2)
2019-10-19 11:59:51 +02:00
Miguel Sacristan
e26a2904fc
Fix and add test's for SFINAE problem
2019-09-10 21:36:23 +02:00
Niels Lohmann
48e1fe03b5
🔖 set version to 3.7.0
2019-07-28 20:20:41 +02:00
Niels Lohmann
a501365ea2
Merge branch 'feature/hedley' into develop
2019-07-14 20:58:08 +02:00
Niels Lohmann
104c5c1996
Merge branch 'feature/json_pointer_contains' into develop
2019-07-09 08:08:56 +02:00
Niels Lohmann
7a23aa1c0d
Merge branch 'feature/emplace_back' into develop
2019-07-09 08:06:27 +02:00
Niels Lohmann
9289a23a76
Merge pull request #1643 from kevinlul/develop
...
Fix json.hpp compilation issue with other typedefs with same name (Issue #1642 )
2019-07-01 22:57:04 +02:00
Niels Lohmann
90798caa62
🚚 rename Hedley macros
2019-07-01 22:37:30 +02:00
Niels Lohmann
897362191d
🔨 add NLOHMANN_JSON prefix and undef macros
2019-07-01 22:24:39 +02:00
Niels Lohmann
1720bfedd1
⚗️ add Hedley annotations
2019-06-30 22:14:02 +02:00
Niels Lohmann
1be63431f3
✨ make emplace_back return a reference #1609
2019-06-30 12:19:41 +02:00
Niels Lohmann
258fa798f1
✨ add contains function for JSON pointers
2019-06-30 10:03:08 +02:00
Niels Lohmann
3b82a350ed
📝 mention 302 exception in value() documentation #1601
2019-06-22 09:44:12 +02:00
kevinlul
f4fca2d59a
Fix #1642
...
While in our case, only the string case was affected, to be safe and allow the library to work with other unforeseen cases, all of the cases have been wrapped with parentheses.
Thank you @DyXel and @edo9300
2019-06-16 18:22:40 -04:00
Macr0Nerd
aa4c45ee4d
Added to_string (with ugly macro) and tests
2019-04-26 18:10:45 -05:00
Théo DELRIEU
e6e6805c6c
add built-in array support in get_to
2019-04-01 17:47:45 +02:00
Niels Lohmann
efa1b9a7bb
🔖 set version to 3.6.1
2019-03-20 20:50:05 +01:00
Niels Lohmann
b33093d610
🐛 fixed regression #1530
2019-03-20 14:40:23 +01:00
Niels Lohmann
c790b9f8c0
🐛 fixed regression #1530
2019-03-20 12:41:08 +01:00
Niels Lohmann
b37392b7ac
🔖 set version to 3.6.0
2019-03-20 00:19:07 +01:00
Niels Lohmann
18cc7ddd62
📝 completed documentation index page
2019-03-19 16:03:02 +01:00
Niels Lohmann
e07e8e7912
📝 updated documentation
2019-03-19 15:40:23 +01:00
Niels Lohmann
b224c52376
🎨 cleanup
2019-03-19 09:17:14 +01:00
Niels Lohmann
8d3f4f21bc
🔨 clean up
2019-03-18 13:53:48 +01:00
Niels Lohmann
22c733e6fe
📝 added documentation
2019-03-17 22:25:18 +01:00
Niels Lohmann
b8451c236f
🚨 fixed warnings
2019-03-17 12:01:49 +01:00
Niels Lohmann
34f8b4f711
🚨 fixed more warnings
2019-03-17 00:27:44 +01:00
Niels Lohmann
27011e3718
🚨 fixed warnings
2019-03-15 14:55:13 +01:00
Niels Lohmann
c983b67112
Merge pull request #1469 from garethsb-sony/json_pointer-append
...
Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers
2019-03-11 22:47:08 +01:00
lieff
7b31e56fbf
fix GCC 7.1.1 - 7.2.1 on CentOS
...
closes https://github.com/nlohmann/json/issues/670
2019-02-25 16:38:22 +03:00
garethsb-sony
164e0e54d9
Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path
2019-02-25 09:26:07 +00:00
Niels Lohmann
e326df211b
Merge pull request #1474 from nickaein/develop
...
Implement contains() member function
2019-02-13 13:05:21 +01:00
Isaac Nickaein
6a5db00951
Implement contains() to check existence of a key
2019-02-13 13:21:54 +03:30
Isaac Nickaein
fb5ceb26ac
Fix documentation
...
Remove two instance of duplicate paragraphs.
2019-02-11 17:00:48 +03:30
Isaac Nickaein
372c4d2125
Merge branch 'develop' into iterate-on-destruction
2019-01-28 02:41:22 +03:30
Niels Lohmann
d359fd3a8d
🚧 trying nodiscard attribute #1433
2019-01-19 17:32:23 +01:00
Isaac Nickaein
f0883dda8f
During destruction, flatten children of objects to avoid recursion
2019-01-15 20:29:51 +03:30
Niels Lohmann
ad01736d55
💡 improved documentation for parsing without exceptions #1405
...
Closes #1405
2019-01-13 11:46:05 +01:00
Niels Lohmann
78348afeb6
🔖 set version to 3.5.0
2018-12-21 23:52:29 +01:00
