haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-04 13:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity
710 commits 16 branches 56 tags 222 MiB
Commit graph

710 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels 258f04c561 fixed #154 (no more warnings for incomplete switches) 2015-12-14 16:32:37 +01:00
Niels a70a7a8001 fixed #135: operator[] now only works on nonconst JSON objects 2015-12-13 11:26:55 +01:00
Niels c767f464bb dropped GCC 4.8 support (due to #110) 2015-12-08 18:12:34 +01:00
Niels 9da8770f3a ignore UTF-8 byte order mark (fixes #152) 2015-12-07 22:27:53 +01:00
Niels e0d334c4f1 added a comment (see #109) 2015-12-07 21:53:32 +01:00
Niels d6771ac79d corrected a username 2015-12-07 21:50:27 +01:00
Niels d9432aa168 Merge pull request #124 from emvivre/master 
remove invalid parameter '-stdlib=libc++' in CMakeLists.txt
 2015-12-07 21:11:58 +01:00
Niels 22bc022745 added change from #140 2015-12-07 21:05:21 +01:00
Niels 72476b4226 cleanup after #153 2015-12-07 20:38:16 +01:00
Niels f36f316fc7 Merge pull request #153 from whackashoe/remove_sprintf 
Replace sprintf with hex function, this fixes #149
 2015-12-07 20:35:43 +01:00
Niels 6f8e36ac3d fixes #136 2015-12-06 17:33:52 +01:00
Jett 14d8a91f73 Replace sprintf with hex function, this fixes #149 2015-11-19 00:30:00 -06:00
Niels c013223276 Merge pull request #146 from robertmrk/surrogate-pair-parsing-fix 
Fix character skipping after a surrogate pair
 2015-11-14 08:22:04 +01:00
Robert Marki ec7a1d8347 Fix character skipping after a surrogate pair 
In a string the first character following a surrogate pair is skipped by the
lexer, but the rest of the string is parsed as usual.
 2015-11-13 13:13:46 +01:00
Niels 3948630374 Merge pull request #130 from dariomt/patch-1 
removed stream operator for iterator, resolution for #125
 2015-10-23 18:42:10 +02:00
Niels 8f379ef3eb Merge pull request #137 from dariomt/patch-3 
Detect correctly pointer-to-const
 2015-10-20 22:31:15 +02:00
dariomt 652e1caa76 Apply same change to the re2c file 2015-10-19 12:34:10 +02:00
dariomt 8162a6e3a3 Apply same change to the re2c file 2015-10-19 12:26:38 +02:00
Niels 746c1a7142 cleanup 2015-10-17 12:51:59 +02:00
Niels 73632377bf Merge pull request #131 from dariomt/patch-2 
disabled "CopyAssignable" test for MSVC in Debug mode, see #125
 2015-10-17 12:41:20 +02:00
dariomt 4b8a822f33 Merge branch 'get_ref' 2015-10-16 16:42:03 +02:00
dariomt 95090a7ddd Merge branch 'patch-2' 2015-10-16 16:40:57 +02:00
dariomt 04cc7d5a05 doh! disable test correctly only for MSVC 2015-10-16 16:36:34 +02:00
dariomt 5198e1f2e4 removed const in get_ptr() by accident 2015-10-16 15:45:47 +02:00
dariomt bd2783f45c Added get_ref() 
Same as get_ptr() but for references.
If the type is incompatible it throws (get_ptr() returns null).
Implemented in terms of get_ptr().
 2015-10-16 15:23:57 +02:00
Dario Menendez 8f97e99feb Merge remote-tracking branch 'origin/patch-3' 2015-10-16 11:23:19 +02:00
Dario Menendez 8d53c5e06f Merge remote-tracking branch 'origin/patch-2' 2015-10-16 11:22:57 +02:00
dariomt b342e1207c Detect correctly pointer-to-const 
The intention of the current code is to detect a pointer-to-const but instead it is detecting a const-pointer. See #134
 2015-10-16 11:11:16 +02:00
dariomt 9d45aafc2c disabled "CopyAssignable" test for MSVC in Debug mode, see #125 
STL iterators used by json::iterator don't pass this test in Debug mode.
The test does pass in Release mode, so I felt the best thing to do was selectively disable that test.
 2015-10-07 18:31:08 +02:00
dariomt 55cbd903e8 removed stream operator for iterator, resolution for #125 
It doesn't really make sense to stream an iterator.
Besides, this was causing trouble in MSVC in Debug mode (see #125)
 2015-10-07 17:50:53 +02:00
Niels 57de1d602e Cleanup 2015-10-03 13:16:59 +02:00
Niels 2550d29ded Merge pull request #122 from d-frey/patch-1 
exception-safe object creation, fixes #118
 2015-10-03 12:29:26 +02:00
Niels 589dc2180a Merge pull request #120 from silverweed/patch-1 
Overload parse() to accept an rvalue reference
 2015-10-03 10:43:16 +02:00
Niels 4eac295211 Merge pull request #115 from whoshuu/patch-1 
Use the right variable name in doc string
 2015-10-03 10:41:26 +02:00
Niels b3ff862afc Merge pull request #121 from ColinH/master 
Fix small oversight.
 2015-10-03 10:39:14 +02:00
Niels 83d068c32c Merge pull request #126 from d-frey/patch-2 
Remove superfluous inefficiency
 2015-10-03 10:38:18 +02:00
Niels 99261bf39c Merge pull request #129 from dariomt/master 
fixed typos in comments for examples
 2015-10-03 10:36:35 +02:00
Dario Menendez 260745810d fixed typos in comments for examples 2015-10-02 15:57:40 +02:00
Daniel Frey 1c43789682 Remove superfluous inefficiency 2015-09-25 20:08:35 +02:00
emvivre 4f27004dd5 remove invalid parameter '-stdlib=libc++' in CMakeLists.txt 2015-09-22 16:57:18 +02:00
Daniel Frey f7fb405564 exception-safe object creation, fixes #118 2015-09-20 20:06:33 +02:00
Huu Nguyen 2d7f1542b1 Use the right variable name in doc string 2015-09-20 07:27:34 -07:00
silverweed 8fdd20cdda Overload parse() to accept an rvalue reference 2015-09-20 16:15:55 +02:00
Colin Hirsch c6c37d00d1 Fix small oversight. 2015-09-20 15:04:51 +02:00
Niels 0a81353989 reverted changes 2015-08-22 10:47:14 +02:00
Niels b9592bd2d6 more compilers 2015-08-22 10:43:04 +02:00
Niels 067e33a7ed removed failing compilers 2015-08-21 19:12:06 +02:00
Niels bb0d01e597 better compiler matrix 2015-08-21 19:05:47 +02:00
Niels 941c84e17d debugging 2015-08-14 15:30:06 +02:00
Niels 3c8c2766c1 debugging 2015-08-14 15:20:50 +02:00