1
0
mirror of https://github.com/nlohmann/json synced 2024-12-05 01:30:07 +00:00
Commit Graph

591 Commits

Author SHA1 Message Date
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
04cc7d5a05 doh! disable test correctly only for MSVC 2015-10-16 16:36:34 +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
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
Niels
23f70b47ad Appveyor fix 2015-08-14 15:09:16 +02:00
Niels
bd5d96c456 minor change 2015-08-14 14:56:58 +02:00
Niels
b58a93b8dd merged #111 2015-08-14 14:45:13 +02:00
Niels
6f2da1a39a try to avoid MSVC bug (https://connect.microsoft.com/VisualStudio/feedback/details/797682/c-decltype-of-class-member-access-incompletely-implemented) 2015-08-13 10:24:28 +02:00
Niels
fadccc34eb fixed iterator_wrapper 2015-08-13 10:08:55 +02:00
Niels
66ec58639b removed failing tests 2015-08-06 23:02:52 +02:00
Niels
2707733920 fixed off-by-one error 2015-08-06 22:53:16 +02:00
Niels
b0eb34394c added test cases for #83 2015-08-06 22:36:08 +02:00
Niels
11ae6da6d9 reverted “fix” for issue #107 2015-08-06 22:35:56 +02:00
Niels
b431203fe8 fixed travis script 2015-08-06 21:33:24 +02:00
Niels
2c3259320d addressed locale-issues #107 2015-08-04 18:12:11 +02:00
Niels
c910853304 fixed build 2015-08-02 21:49:42 +02:00
Niels
b00e627c30 fixed build 2015-08-02 21:47:11 +02:00
Niels
9355dce063 fixed build 2015-08-02 21:40:25 +02:00
Niels
e64dc532ab fixed build 2015-08-02 21:35:07 +02:00
Niels
b5a05e1121 add a test for the iterator_wrapper 2015-08-02 21:27:02 +02:00
Niels
c974e32677 fixed the build 2015-07-30 23:02:55 +02:00
Niels
8eb32084b4 code for #83 (no tests yet) 2015-07-30 21:32:18 +02:00
Niels
a26e44d66e prepare 1.0.0-rc1 2015-07-26 20:44:55 +02:00