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
Jorrit Wronski
7b8ddadd83
removed hunter badge
2017-11-16 21:01:27 +01:00
Jorrit Wronski
b5ddd99adf
Updated hunter package links
2017-11-15 08:48:11 +01:00
Niels Lohmann
4c4f60f438
📝 fixes #820
2017-11-06 20:35:05 +01:00
Niels Lohmann
1af5601a2a
Merge pull request #811 from Itja/patch-1
...
Typos README
2017-10-31 18:23:42 +01:00
Itja
e423aea64a
Typos README
...
Hey, thanks for this great library which I've used in many occasions now. I know it's not much, but I wanted to contribute at least a tiny bit back to you by this PR :-) Keep up the good work!
2017-10-31 16:31:14 +01:00
Niels Lohmann
5696660eba
🔨 another try to fix #714
...
adding std::ios_base::binary when opening all_unicode.json.cbor
2017-10-31 15:04:14 +01:00
Niels Lohmann
c4d6626745
🚀 installed Request Info Bot
2017-10-30 16:04:34 +01:00
Niels Lohmann
6d2981db82
📝 overworked templates
2017-10-29 16:32:23 +01:00
Niels Lohmann
87df1d6708
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2017-10-29 11:55:04 +01:00
Niels Lohmann
fa1425b87c
🚀 installed Sentiment Bot
2017-10-29 11:54:53 +01:00
Niels Lohmann
73d0095154
Merge pull request #807 from theodelrieu/fix/805
...
add forwarding references to json_ref constructor
2017-10-28 15:33:22 +02:00
Théo DELRIEU
4b46abf97c
add forwarding references to json_ref constructor
...
fixes #805
2017-10-28 14:22:57 +02:00
Niels Lohmann
8e067c0c3c
🔨 set bidirectional iterator tag #593
2017-10-28 09:41:35 +02:00
Niels Lohmann
cea3f24ff9
📝 comment to address #561
2017-10-27 16:39:52 +02:00
Niels Lohmann
61cc07ff38
📝 some documentation
2017-10-27 16:07:04 +02:00
Niels Lohmann
734e2b73cf
🔨 cleanup
2017-10-27 11:49:24 +02:00
Niels Lohmann
7820b5eccb
📝 thanks for #795
2017-10-27 11:49:17 +02:00
Niels Lohmann
77f8e2f987
Merge pull request #795 from jseward/develop
...
Add transparent comparator and perfect forwarding support to find() and count()
2017-10-27 11:47:23 +02:00
Niels Lohmann
c215b77936
🚀 installed Stale Bot
2017-10-25 11:37:33 +02:00
Jamie Seward
992c836b30
Add missing spaces
2017-10-24 00:14:25 -07:00
Jamie Seward
715c98b404
Remove extra spaces
2017-10-24 00:06:22 -07:00
Jamie Seward
6c9a401ebc
Remove old non-perfect forwarding find and count
2017-10-24 00:01:56 -07:00
Jamie Seward
16ffdbcb20
Remove c++17 support flag in cmake
...
Already covered by AppVeyor
2017-10-23 23:50:06 -07:00
Jamie Seward
73b1629a15
Remove tabs for spaces
2017-10-23 23:45:39 -07:00
Niels Lohmann
1b1bd0e3e6
⏪ #714 is still not fixed
2017-10-23 12:01:50 +02:00
Jamie Seward
33c6511dd0
Remove JSON_HAS_STRING_VIEW
...
Instead implement @gregmarr's PR comments that perfect forwarding should be used. Also cleaned up cpp language standard detection.
2017-10-23 00:43:26 -07:00
Niels Lohmann
89650c99dd
🚧 checking if #714 is now fixed with MSVC
...
Hopefully, #764 fixed this.
2017-10-22 11:16:33 +02:00
Niels Lohmann
b0c380b0f8
📝 cleanup after the last PRs
2017-10-22 09:12:35 +02:00
Niels Lohmann
be4fba7baf
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2017-10-22 08:53:46 +02:00
Niels Lohmann
f193427e91
🔨 some simplifications
2017-10-22 08:53:43 +02:00
Niels Lohmann
24b6e028a9
✅ improved test coverage
2017-10-22 08:53:27 +02:00
Niels Lohmann
3094640446
Merge pull request #764 from pjkundert/develop-simplify-istream
...
Simplified istream handing #367
2017-10-22 08:52:28 +02:00
Niels Lohmann
ef40673acb
Merge branch 'develop' into develop-simplify-istream
2017-10-22 08:52:15 +02:00
Jamie Seward
d468f8c4e6
Use consistent logic to determine if string_view exists
2017-10-21 16:36:05 -07:00
