Niels Lohmann
afebb6a3bb
Merge branch 'release/3.0.0' into develop
2017-12-17 11:04:53 +01:00
Niels Lohmann
106f9f5436
⬆️ updated git-update-ghpages script
2017-12-17 10:20:30 +01:00
Niels Lohmann
9eb5e2c271
🔖 set version to 3.0.0
2017-12-17 08:40:19 +01:00
Niels Lohmann
9e3c4ad11f
🔖 set version to 3.0.0
2017-12-17 08:31:18 +01:00
Niels Lohmann
314e4e7699
📝 improved documentation for dump and iterator_wrapper
2017-12-16 23:58:10 +01:00
Niels Lohmann
9a51fb4da2
🚨 fixed some warnings
2017-12-16 22:19:30 +01:00
Niels Lohmann
7bf007f2bc
Merge pull request #879 from nlohmann/feature/algorithms
...
✅ re-added tests for algorithms
2017-12-16 12:41:07 +01:00
Niels Lohmann
980795b644
✏️ fixed typos
2017-12-16 12:37:44 +01:00
Niels Lohmann
f3bd755cab
➖ removing <iomanip> header
2017-12-16 12:37:25 +01:00
Niels Lohmann
4c871c58f8
✅ re-added tests for algorithms
2017-12-16 11:16:34 +01:00
Niels Lohmann
c23f5dcea6
📝 fixed year
2017-12-15 23:49:37 +01:00
Niels Lohmann
2e1b1061cd
Merge pull request #875 from nlohmann/feature/spelling
...
Overworked library toward 3.0.0 release
2017-12-14 22:31:19 +01:00
Niels Lohmann
261caec2de
👥 added contributor image
2017-12-14 22:29:39 +01:00
Niels Lohmann
f80827d068
Merge pull request #873 from nlohmann/feature/issue872
...
🚨 remove C4996 warnings #872
2017-12-14 09:35:48 +01:00
Niels Lohmann
9a70c60fa5
Revert " ⬆️ updated to Catch 2.0.1"
...
This reverts commit 920f64c01c
2017-12-14 07:49:16 +01:00
Niels Lohmann
fb8482db76
👌 fixed some issues from the last commit #875
2017-12-13 23:44:53 +01:00
Niels Lohmann
c6e7eae394
✨ implemented JSON Merge Patch (RFC 7396)
...
SQLite's json1 extension (https://www.sqlite.org/json1.html ) supports JSON Merge Patch (https://tools.ietf.org/html/rfc7396 ). As the implementation is trivial and we already support JSON Patch, I think this could be a nice extension to the library.
2017-12-13 23:36:22 +01:00
Niels Lohmann
920f64c01c
⬆️ updated to Catch 2.0.1
...
Update required all CHECK_THROWS_AS macros to pass the exception type without reference, because this is now done by Catch2.
2017-12-13 22:18:05 +01:00
Niels Lohmann
293748a9a9
📝 overworked README
...
- Added recent contributors to thanks list.
- Linked PGP key for private mails.
- Updated compiler list.
2017-12-13 22:17:02 +01:00
Niels Lohmann
e8d9963abe
👌 cosmetic changes and overworked spelling
...
- All hex literals use upper case letters after the x.
- Fixed sime typos.
- Documented some more functions.
2017-12-13 22:15:53 +01:00
Niels Lohmann
a9a4ff61c6
🚨 remove C4996 warnings #872
...
These were the remaining direct calls to alloc.
2017-12-13 17:01:39 +01:00
Niels Lohmann
f7ae143a93
Merge pull request #870 from nlohmann/feature/issue838
...
💥 throwing an exception in case dump encounters a non-UTF-8 string #838
2017-12-13 06:34:11 +01:00
Niels Lohmann
8419bfbbd2
✅ improved test coverage
...
As we guarantee proper UTF-8 before, we do not need to cope with it later.
2017-12-12 20:44:57 +01:00
Niels Lohmann
569d275f65
💥 throwing an exception in case dump encounters a non-UTF-8 string #838
...
We had a lot of issues with failing roundtrips (i.e., parse errors from serializations) in case string were stored in the library that were not UTF-8 encoded. This PR adds an exception in this case.
2017-12-11 22:38:05 +01:00
Niels Lohmann
383743c6c0
Merge pull request #868 from nlohmann/feature/issue867
...
📝 fixing documentation #867
2017-12-11 08:55:26 +01:00
Niels Lohmann
7de009edd1
✏️ fixing typos #869
2017-12-10 13:07:47 +01:00
Niels Lohmann
772bb3cc20
📝 fixing documentation #867
...
The example in the documentation on how to "force" an array of arrays was wrong since the first release. Fixed the documentation and added checks for the README unit tests.
2017-12-10 12:32:20 +01:00
Niels Lohmann
0693945230
Merge pull request #860 from bogemic/std_iterator_conformance_cpp17
...
iter_impl template conformance with C++17
2017-12-08 07:55:47 +01:00
Mike Bogdanov
64d6daa76e
iter_impl template conformance with C++17
2017-12-07 11:30:17 +03:00
Niels Lohmann
7c2d4f1852
👷 added Xcode 9.1 and 9.2
2017-12-06 22:32:03 +01:00
Niels Lohmann
9e2f185ac6
💄 reformatted code after PRs
2017-12-06 22:21:11 +01:00
Niels Lohmann
c5e731774a
Merge pull request #856 from bogemic/std_allocator_conformance_cpp17
...
Std allocator conformance cpp17
2017-12-06 21:52:52 +01:00
Niels Lohmann
25d205c16d
📝 clarified difference between serialization and string value retrieval #853
2017-12-06 21:42:36 +01:00
Niels Lohmann
fa76f2efd7
Merge pull request #855 from theodelrieu/fix/cmake_include_directories
...
cmake: use BUILD_INTERFACE/INSTALL_INTERFACE
2017-12-06 20:47:38 +01:00
Mike Bogdanov
8890b935fd
fixed merge conflicts
2017-12-06 12:24:50 +03:00
Mike Bogdanov
daba1b6a0b
fixed conformance with C++17, some members of allocator are depricated and should be used via allocator_traits
2017-12-06 11:20:42 +03:00
Niels Lohmann
0e3a0b730b
Merge pull request #854 from theodelrieu/fix/force_msvc_stacktrace
...
to/from_json: add a MSVC-specific static_assert to force a stacktrace
2017-12-05 19:36:31 +01:00
Théo DELRIEU
541ee62a05
cmake: use BUILD_INTERFACE/INSTALL_INTERFACE in target_include_directories
2017-12-05 11:27:03 +01:00
Théo DELRIEU
c9a02cbc59
to/from_json: add a MSVC-specific static_assert to force a stacktrace
2017-12-05 10:52:55 +01:00
Niels Lohmann
f4c01601fa
Merge pull request #844 from TinyTinni/develop
...
Add .natvis for MSVC debug view
2017-12-04 21:43:22 +01:00
Matthias Möller
24fe572d98
missing new line
2017-11-30 13:37:58 +01:00
Matthias Möller
8e9a8792a9
moved natis to root dir
2017-11-30 13:26:45 +01:00
Matthias Möller
af775ddbb8
add compiler & cmake version check
2017-11-28 23:43:39 +01:00
Matthias Möller
48d7a32daa
add .natvis for MSVC debug view
2017-11-26 10:31:33 +01:00
Matthias Möller
5b4855dea2
fix targetname
2017-11-26 10:29:51 +01:00
Niels Lohmann
cc937deaf6
🚑 the last commit contained a bug #821
2017-11-26 10:15:23 +01:00
Niels Lohmann
430f03512c
🚨 fixed some warnings #821
2017-11-25 22:06:18 +01:00
Niels Lohmann
ea5aed0769
Merge branch 'feature/to_array' into develop
2017-11-25 19:41:11 +01:00
Niels Lohmann
de75cf89f7
✅ improved test coverage
2017-11-25 19:41:02 +01:00
Niels Lohmann
52ca35b2b0
Merge pull request #829 from jowr/patch-1
...
Updated hunter package links
2017-11-18 13:35:21 +01:00
