haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-16 11:23:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
1733 commits 12 branches 56 tags 226 MiB
Commit graph

1733 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann 19d2dec8b6
📝 added badge from isitmaintained.com 2017-05-03 22:49:21 +02:00
Niels Lohmann c42273d2a0
📝 fixed documentation #565 
The documentation mismatched the actual code.
 2017-04-23 21:46:30 +02:00
Niels Lohmann 2df8f12c09
🏁 another fix for MSVC #464 
needed for VS2015.3 with /std:c++latest
 2017-04-23 20:51:29 +02:00
Niels Lohmann 4b316ec528
Merge branch 'feature/insert' into develop 2017-04-22 09:58:37 +02:00
Niels Lohmann 9b32f72584
📝 fixed examples for Wandbox 
As I learned in https://github.com/melpon/wandbox/issues/209, this
library is already installed at Wandbox, so we need to adjust the
examples to use `#include "json.hpp"` insteas of `#include <json.hpp>`.
 2017-04-21 22:07:07 +02:00
Niels Lohmann aea47422a2
📝 updated links and output 2017-04-14 18:13:01 +02:00
Niels Lohmann 6b6e554067
🐛 added missing header 
std::setw needs the iomanip header (at least with GCC).
 2017-04-14 17:37:28 +02:00
Niels Lohmann 951d0920fc
🐛 fixed README example 
The example with the size() operator is bad: using operator[] already
changes the size of the object. The fix makes it clearer.
 2017-04-14 17:36:45 +02:00
Niels Lohmann e2f6cf7f46
🔥 removed .test files 
These files were never meant to be versioned.
 2017-04-14 17:35:31 +02:00
Niels Lohmann d4469233ac
Merge branch 'develop' into feature/insert 2017-04-12 18:01:06 +02:00
Niels Lohmann 42b4cdd4d0
👷 Travis is very picky 2017-04-11 22:13:26 +02:00
Niels Lohmann ef55626296
👷 added Clang 3.9-5.0 
Taken from
https://github.com/travis-ci/docs-travis-ci-com/pull/746/files.
 2017-04-11 20:37:38 +02:00
Niels Lohmann 5bea6f383a
✏️ fixed a typo 2017-04-11 18:57:53 +02:00
Niels Lohmann 4c161161f0
Merge branch 'feature/vs2017' into develop 2017-04-10 19:51:58 +02:00
Niels Lohmann e48114bbd6
🔨 check for value of _HAS_CXX17 2017-04-09 14:02:04 +02:00
Niels Lohmann 628be157a2
🐛 added fix for #464 2017-04-09 13:52:04 +02:00
Niels Lohmann c40c8ac92e
👷 excluding MSVC 2015 with "/permissive- /std:c++latest /utf-8" 2017-04-09 12:00:30 +02:00
Niels Lohmann a9f4094580
👷 another try 2017-04-09 11:47:31 +02:00
Niels Lohmann 180d249f6c
👷 another try 2017-04-09 11:38:42 +02:00
Niels Lohmann d3d87674c8
👷 fixed AppVeyor syntax 2017-04-09 11:00:39 +02:00
Niels Lohmann 9d9c5216d7
👷 additional flags for MSVC #464 
To test a fix for issue #464 (not yet implemented), we first need to
have  an MSVC build with “/permissive- /std:c++latest /utf-8”.
 2017-04-09 10:59:45 +02:00
Niels Lohmann d4e49873b7
👷 experimenting with configurations 2017-04-08 21:56:42 +02:00
Niels Lohmann 97a25de938
✨ proposal for #428 
This implementation forwards the iterators to std::map::insert.
 2017-04-07 18:29:09 +02:00
Niels Lohmann 90273e930c
🐛 fix for #512 
We totally forgot to implement the comparison operators other than ==
and != for scalar types. Consequently, comparing a JSON value with a
scalar type led to compile errors.
 2017-04-07 15:44:41 +02:00
Niels Lohmann 4f6b63e492 Merge pull request #545 from theodelrieu/feature/enum_class_support 
add enum class default conversions
 2017-04-03 22:13:59 +02:00
Théo DELRIEU af9b21151c add enum class default conversions 2017-04-02 13:10:15 +02:00
Niels Lohmann d07596a0ea
📝 mentioned #540 and fixed #538 2017-03-30 17:39:02 +02:00
Niels Lohmann 7881783745 Merge pull request #540 from tinloaf/diagnostics 
Properly pop diagnostics
 2017-03-30 17:25:29 +02:00
Lukas Barth 0b1b6307a5 Also change the re2c file 2017-03-30 16:14:02 +02:00
Lukas Barth 40aff4182f Pop for every push 2017-03-30 16:10:03 +02:00
Niels Lohmann c2e80a72d7
🔨 deprecated j << istream / j >> ostream functions #367 
The implementation is non-standard. Deprecation allows a simpler API in
the future without removing any features.
 2017-03-29 00:39:47 +02:00
Niels Lohmann b4dbebffcd
✅ added regression test for #464 2017-03-28 23:28:54 +02:00
Niels Lohmann 62dfdf3f5d
📝 addressed #514 
NaN values never compare equal to themselves or to other NaN values.
 2017-03-28 23:24:59 +02:00
Niels Lohmann 19cd206d99
📝 documented Xcode 8.3 2017-03-28 21:39:16 +02:00
Niels Lohmann a0aa6ad2b2
👷 added Xcode 8.3 
https://blog.travis-ci.com/2017-03-28-xcode-83-ga-is-here
 2017-03-28 20:42:12 +02:00
Niels Lohmann d4d51460ab
Merge branch 'feature/noexcept_exceptions' into develop 2017-03-26 12:54:22 +02:00
Niels Lohmann 3336194306
🔨 reverted changes that led to Travis failures 2017-03-26 12:23:10 +02:00
Niels Lohmann 53b501a785
🔨 cleanup 2017-03-25 23:31:03 +01:00
Niels Lohmann cf7786887c
🔨 fixed check for is_nothrow_copy_constructible 
We now only demand our exceptions to be is_nothrow_copy_constructible
if std::runtime_exception is.
 2017-03-25 17:35:57 +01:00
Niels Lohmann c333679a96
🔨 small refactoring 
The solution with a std::runtime_error member is more elegant. It
allows to have std::exception as base class again. However, I still
have no idea why GCC thinks the copy constructor may throw...
 2017-03-25 17:25:39 +01:00
Niels Lohmann cc36c65a89
🚑 made exceptions nothrow-copy-constructible #531 
To have nothrow-copy-constructible exceptions, we inherit from
std::runtime_error which can cope with arbitrary-length error messages.
Intermediate strings are built with static functions and then passed to
the actual constructor.
 2017-03-25 16:22:52 +01:00
Niels Lohmann a58ed3cd17
💄 cleanup 2017-03-25 14:47:23 +01:00
Niels Lohmann 20bcf1015b
📝 cleanup after #536 2017-03-25 14:19:05 +01:00
Niels Lohmann 0f9585685a Merge pull request #536 from vpetrigo/feature/VS17_appveyor_support 
Add Visual Studio 17 image to appveyor build matrix
 2017-03-25 14:12:30 +01:00
Vladimir Petrigo 8edb0cd15c Add VS17 image to appveyor matrix 2017-03-25 14:57:58 +03:00
Niels Lohmann 3d597dda5d
📝 update after #534 2017-03-24 19:51:11 +01:00
Niels Lohmann bba688f53e Merge pull request #534 from TedLyngmo/utf8_encoding_enhancement 
UTF8 encoding enhancement
 2017-03-24 19:38:29 +01:00
Ted Lyngmo cea2426731 UTF8 encoding enhancement 2017-03-24 14:56:48 +01:00
Niels Lohmann 8a872927e8 Merge pull request #530 from berkus/patch-1 
Fix typo
 2017-03-23 13:57:54 +01:00
Berkus Decker b14629b0a6 Fix typo 2017-03-23 14:50:41 +02:00