j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2950 commits 1 branch 0 tags 274 MiB
Commit graph

2950 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann
d39842e68f
Merge pull request #1330 from ax3l/topic-installEmbed 
CMake: Optional Install if Embedded
 2019-03-13 11:13:09 +01:00
Niels Lohmann
670f42b561
🔥 removing Xcode 6.4 builder 2019-03-11 22:59:22 +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
Niels Lohmann
c11bead2ae
👷 removing more retired Travis images 2019-03-11 21:22:30 +01:00
Niels Lohmann
3cd1dac653
🚨 fix MSVC warning #1502 2019-03-11 15:33:23 +01:00
Niels Lohmann
cabe2357b8
Merge pull request #1492 from stac47/fix_gcc9_allocator 
Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472)
 2019-03-11 15:21:54 +01:00
Niels Lohmann
16d9cdce45
📝 updated documentation of CI 2019-03-11 15:19:50 +01:00
Niels Lohmann
e3729ba0a5
💚 fix compiler selection 2019-03-11 07:44:40 +01:00
Niels Lohmann
e5c7fd488d
👷 trying new Travis workers 2019-03-10 22:56:14 +01:00
Niels Lohmann
5047c7a217
🐛 added missing include #1500 2019-03-10 22:26:57 +01:00
Niels Lohmann
8eb7db7277
Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if 
Use C++11 features supported by CMake 3.1.
 2019-03-10 22:08:16 +01:00
Niels Lohmann
393410e61a
Merge pull request #1495 from njlr/patch-1 
Update Buckaroo instructions in README.md
 2019-03-10 22:03:49 +01:00
Niels Lohmann
30edcaab3a
Merge pull request #1496 from lieff/develop 
fix GCC 7.1.1 - 7.2.1 on CentOS
 2019-03-10 22:01:52 +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
njlr
8aeee4f7e3
Update README.md 
* Updates Buckaroo instructions to v2
 2019-02-25 09:44:38 +00:00
garethsb-sony
d183bd0456 Tests for json_pointer::empty and json_pointer::parent_pointer 2019-02-25 09:26:08 +00:00
garethsb-sony
08de9eeaca Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path) 2019-02-25 09:26:08 +00: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
Laurent Stacul
ddc9f201f4 Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472) 2019-02-22 16:05:41 +00:00
Niels Lohmann
21516f2bae
Merge pull request #1491 from nickaein/patch-1 
Fix typo in README.md
 2019-02-22 09:50:45 +01:00
Isaac Nickaein
088a245218
Fix typo in README.ME 
Fixes https://github.com/nlohmann/json/issues/1486.
 2019-02-22 01:05:00 +03:30
Niels Lohmann
e326df211b
Merge pull request #1474 from nickaein/develop 
Implement contains() member function
 2019-02-13 13:05:21 +01:00
Niels Lohmann
c55cacee1e
Merge pull request #1477 from nickaein/fix-doc 
Fix documentation
 2019-02-13 13:03:46 +01:00
Isaac Nickaein
e93f305494 Add unit-test for contains() member function 2019-02-13 13:21:54 +03:30
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
Niels Lohmann
46ff13d39e
Merge pull request #1468 from past-due/disable_Wmismatched_tags_on_tuple 
Disable Clang -Wmismatched-tags warning on tuple_size / tuple_element
 2019-02-10 21:50:12 +01:00
Niels Lohmann
eee3bc0c79
Merge pull request #1464 from elvisoric/update_meson_install_step 
Disable installation when used as meson subproject. #1463
 2019-02-10 21:48:20 +01:00
garethsb-sony
5da757bbb3 Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string 2019-01-31 23:39:57 +00:00
garethsb-sony
c850e9d82d Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path 2019-01-31 19:15:50 +00:00
past-due
45819dce54 Disable -Wmismatched-tags warning on tuple_size / tuple_element 2019-01-30 12:59:50 -05:00
Elvis Oric
77d1d37290 Disable installation when used as meson subproject. #1463 2019-01-30 11:40:14 +01:00
Niels Lohmann
68ec3eb8d6
Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon 
remove extra semicolon from readme
 2019-01-25 13:36:18 +01:00
Niels Lohmann
de14b5ee2f
Merge pull request #1455 from wythe/patch-2 
docs: README typo
 2019-01-25 13:36:07 +01:00
Mark Beckwith
cca6d0dbae
docs: README type 
Just another small typo I found in the README.
 2019-01-24 10:49:45 -06:00
Patrick Boettcher
a06e7f5d80 JSON-pointer: add operator+() returning a new json_pointer 2019-01-24 16:46:51 +01:00
Matěj Plch
dc21cbb751
remove extra semicolon 
in example of NLOHMANN_JSON_SERIALIZE_ENUM
 2019-01-22 10:13:12 +01:00
Niels Lohmann
e89c946451
Merge branch 'feature/nodiscard' into develop 2019-01-20 15:41:30 +01:00
Niels Lohmann
6de4df23e4
🐛 fixed integer overflow in dump function #1447 
Closes #1447.
 2019-01-20 12:26:01 +01:00
Niels Lohmann
e17e0d031f
Merge pull request #1446 from scinart/develop 
attempt to fix #1445, flush buffer in serializer::dump_escaped in UTF8_REJECT case.
 2019-01-20 12:18:02 +01:00
Niels Lohmann
e36593e960
🔨 trying code from https://godbolt.org/z/-tLO1K 2019-01-20 11:12:20 +01:00
scinart
20db020c1f move newly-added tests in unit-regression.cpp 2019-01-19 11:36:50 -05:00
Niels Lohmann
d359fd3a8d
🚧 trying nodiscard attribute #1433 2019-01-19 17:32:23 +01:00
Niels Lohmann
b9a39b38bf
Merge pull request #1434 from pboettch/develop 
allow push_back() and pop_back() calls on json_pointer
 2019-01-19 17:07:36 +01:00
scinart
83e84446d6
fix typo 2019-01-18 20:55:01 -05:00
scinart
899bd94b43 flush buffer in serializer::dump_escaped case UTF8_REJECT 
serializer use fixed buffer. Whenever it is nearly full, it is flushed to `output_adapter_t<char> o`
But the code forgets to flush when there is a invalid utf8 code point
So there will be buffer overflow.
 2019-01-18 20:35:48 -05:00
Ivor Wanders
4fd9b52fc2 Use C++11 features supported by CMake 3.1. 2019-01-16 08:50:58 -05:00
Niels Lohmann
dffae1082f
Merge pull request #1435 from pboettch/warning-fix 
🚨 fixed unused variable warning
 2019-01-15 22:18:13 +01:00
Niels Lohmann
851fe8a5ef
Merge pull request #1430 from nicoddemus/conda-docs 
Add instructions about using nlohmann/json with the conda package manager
 2019-01-15 22:16:49 +01:00
Patrick Boettcher
d0c0d16110 🚨 fixed unused variable warning 
Since 6503e83e74 "Improve dump_integer performance by implementing a more efficient int2ascii"
an unused variable and thus a warning existed.
 2019-01-15 15:21:02 +01:00