mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-27 23:57:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,023 Commits 14 Branches 56 Tags 286 MiB
ef826b6fba
Commit Graph

4023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann
94dfecd487
👷 removed g++ 2017-08-10 19:31:43 +02:00
Niels Lohmann
8963aae57d
👷 clang-3.6 2017-08-10 19:24:36 +02:00
Niels Lohmann
5aceb0e029
👷 clang-3.6 2017-08-10 19:23:55 +02:00
Niels Lohmann
e7a7e4f81f
👷 fixed compiler 2017-08-10 19:18:45 +02:00
Niels Lohmann
e333562633
👷 different source 2017-08-10 19:15:16 +02:00
Niels Lohmann
eb6de822bb
👷 clang-3.7 2017-08-10 19:12:04 +02:00
Niels Lohmann
c1642affaa
👷 clang-3.8 2017-08-10 19:03:35 +02:00
Niels Lohmann
a46afd4008 Merge pull request #679 from traits/patch-1 
Digraph warning
 2017-08-10 11:39:13 +02:00
traits
54c67dcfec Update json.hpp 2017-08-10 09:05:00 +02:00
Niels Lohmann
99ea12f304
📝 acknowledgements for #674, #678, #682, #685, and #686 2017-08-10 06:50:34 +02:00
Niels Lohmann
d26b3f1fe5 Merge pull request #686 from WebProdPP/patch-1 
Update json.hpp
 2017-08-10 06:44:59 +02:00
Niels Lohmann
345846b514 Merge pull request #685 from daixtrose/patch-1 
Remove duplicate word
 2017-08-09 15:32:33 +02:00
WebProdPP
c9509ccf97 Update json.hpp 
mistake
 2017-08-09 16:13:43 +03:00
Markus Werle
86b3d06a93 remove duplicate word 
s/to to/to/
 2017-08-09 11:56:48 +02:00
Niels Lohmann
6e5b895f87 Merge pull request #682 from kbthomp1/fix-intel-osx 
To fix compilation issue for intel OSX compiler
 2017-08-09 10:16:03 +02:00
Kyle Thompson
4b55f0ebd6 To fix compilation issue for intel OSX compiler 
o To prevent the compilation issue on OSX with the intel compiler suite.  The
error was found with icpc version 15.0.3.187 where the "__clang_version__" was
not defined correctly, while "__clang__" was.
 2017-08-08 18:43:03 -04:00
Niels Lohmann
c90bf5e0f1
👷 removed failing builders 2017-08-08 21:26:15 +02:00
Niels Lohmann
dd008545d1
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2017-08-08 19:15:49 +02:00
Niels Lohmann
054b0250be
👷 trying to install g++ to make clang work 2017-08-08 19:14:22 +02:00
traits
ab44a50d98 Digraph warning 
The original version can trigger a digraph-related warning in VS2015. Is this namespace construct a typo or something deliberate?
 2017-08-07 14:23:48 +02:00
Niels Lohmann
b32a6b8c75 Merge pull request #678 from DmitryKuk/develop 
massage -> message
 2017-08-05 13:42:43 +02:00
DmitryKuk
19437c15de massage -> message 2017-08-05 10:43:08 +03:00
Niels Lohmann
e523312fa2
✅ improved test coverage 2017-08-03 17:47:42 +02:00
Niels Lohmann
d2c3592908
✅ added test cases for update #661 2017-08-02 22:44:58 +02:00
Niels Lohmann
d1e13d5128
🎉 first draft for #661 2017-08-02 22:12:41 +02:00
Niels Lohmann
0ea0d7d860 Merge pull request #674 from wincent/patch-1 
Fix "not constraint" grammar in docs
 2017-08-01 20:21:04 +02:00
Niels Lohmann
efdfd3aa5b
⚡ replaced by-value call #673 2017-08-01 19:37:25 +02:00
Greg Hurrell
391303521a Fix "not constraint" grammar in docs 2017-08-01 08:56:28 -07:00
Niels Lohmann
76ecb2bd60 Merge pull request #671 from dan-42/develop 
Add documentation for integration with CMake and hunter
 2017-08-01 07:15:55 +02:00
dan-42
db0b9732d4 DOC: add sort mentioning about support in hunter 2017-07-31 23:20:37 +02:00
Niels Lohmann
e60002a1b3
🔨 fixed GCC warnings in #663 
https://github.com/nlohmann/json/pull/663#issuecomment-318931884
 2017-07-31 23:17:14 +02:00
dan-42
966989a3f5 CONFIG: pin cmake to enable only C++ 2017-07-31 09:49:26 +02:00
Niels Lohmann
850d856aae
🔨 cleanup after #663 2017-07-30 20:30:05 +02:00
Niels Lohmann
3d67ec40a6
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2017-07-30 20:01:35 +02:00
Niels Lohmann
85c768084b
🔨 using emplace 2017-07-30 20:01:31 +02:00
Niels Lohmann
67fb517ccd Merge pull request #669 from dan-42/change_installed_cmake_include_path 
REFACTOR: rewrite CMakeLists.txt for better inlcude and reuse
 2017-07-30 20:01:03 +02:00
Niels Lohmann
80e95844f6 Merge pull request #663 from himikof/move-construction 
Support moving from rvalues in std::initializer_list
 2017-07-30 20:00:46 +02:00
Niels Lohmann
aad55219f8 Merge branch 'develop' into move-construction 2017-07-30 19:49:24 +02:00
Niels Lohmann
96dd4ffa19
🔨 simplified a call 2017-07-30 18:30:34 +02:00
Niels Lohmann
7737a29518
🔨 small parser performance improvements 
- replaced list of pairs by flat list in next_byte_in_range
- implemented early exit in case of parse errors
- reused memory for object keys
- direct calls to embedded objects/arrays for insertions
 2017-07-30 13:25:36 +02:00
dan-42
f434942371 REFACTOR: rewrite CMakeLists.txt for better inlcude and reuse 
The rewrite uses more cmake build-in automatisms and build-in generates
variables to allow better generic reuse.
* cmake  files are installed to
``` <install_prefix>/lib/cmake/nlohmann_json/ ``` for best support on
most systems
* include path is set to ``` include ```  for usage as ``` #include
<nlohmann/json.hpp> ```
 2017-07-29 11:59:09 +02:00
Niels Lohmann
c819a2d732
🔨 refactored some scanner internals 2017-07-28 19:18:50 +02:00
Niels Lohmann
5851daa576
✨ binary formats can be stored in std::string, std::ofstreams or std::ostringstream #477 2017-07-28 00:21:55 +02:00
Niels Lohmann
c136b6f200 Merge pull request #666 from effolkronium/develop 
enable_testing only if the JSON_BuildTests is ON
 2017-07-27 20:48:56 +02:00
Niels Lohmann
7d51214045
✨ implemented exception-free parser #458 #582 
You can now pass a boolean "allow_exceptions" to the parse functions. If it is false, no exceptions are thrown in case of a parse error. Instead, parsing is stopped at the first error and a JSON value of type "discarded" (check with is_discarded()) is returned.
 2017-07-27 20:33:11 +02:00
Ilya Polishchuk
a27dd3a6f6 enable_testing only if JSON_BuildTests is ON 2017-07-27 17:50:24 +03:00
Niels Lohmann
669ebf51bc
🔨 fixed an error in MSVC 2017-07-27 06:04:35 +02:00
Niels Lohmann
3d589fd032
🔨 fixed compilation error 2017-07-26 23:59:56 +02:00
Niels Lohmann
e6aa700360
🔨 cleanup 2017-07-26 23:44:55 +02:00
Nikita Ofitserov
93bb71232d Move from rvalues eagerly to work around MSVC problem 
On MSVC compiler, temporaries that are constructed during a
list initialization, are sometimes destroyed even before calling
the initializing constructor, instead of at the end of the
containing full-expression. This is clearly non-conforming to
[class.temporary].
As the impact of this bug is silently producing incorrect
JSON values, move eagerly from rvalues to be safe.

See https://stackoverflow.com/questions/24586411
 2017-07-25 12:17:32 +03:00