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

631 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels 3905406f9c removed an unnecessary cast (fixed #162) 2015-12-29 12:30:05 +01:00
Niels aca6a3b373 version number 2015-12-28 15:04:15 +01:00
Niels cb5581392a preparing 1.0.0 release 2015-12-28 14:51:57 +01:00
Niels 80cdecaadd fixed a cppcheck warning 2015-12-27 18:07:21 +01:00
Niels d80bbffc78 minor cleanup 2015-12-27 17:58:36 +01:00
Niels 7371c71d2a using CHECK_THROWS_WITH to check exceptions (#160) 2015-12-27 15:30:30 +01:00
Niels d6b8830e03 more work on exceptions (#160) 2015-12-26 13:17:32 +01:00
Niels dc8ab92552 more tests for exceptions (#160) 2015-12-25 13:04:40 +01:00
Niels 76e5e29eda overworked exceptions and tests (#160) 2015-12-25 11:46:18 +01:00
Niels 8620583cf9 cleanup 2015-12-23 12:05:57 +01:00
Niels fcbd984e0f cleanup 2015-12-23 08:44:34 +01:00
Niels 70493a10d1 iterator_wrapper for const objects (#83) 2015-12-23 08:21:29 +01:00
Niels 00f9296db5 some cleanup for #83 2015-12-22 18:07:51 +01:00
Niels 67c2d90a21 working on #160 2015-12-22 13:27:40 +01:00
Niels 4351698c83 re-adding const version operator[] (#135, #159) 
It was a good idea to implement a const version of operator[] it in the
first place. I was a pity that this implementation was flawed. It was a
mistake to remove the const version completely. This commit
re-introduces the const version. My apologies for all the inconvenience.
 2015-12-21 08:42:42 +01:00
Niels 9def0186be upgraded Catch to v1.3.1 2015-12-20 15:42:01 +01:00
Niels 457bfc2401 work on #144 2015-12-20 15:30:07 +01:00
Niels 1adb9d62dd fixed #156 2015-12-17 16:52:38 +01:00
Niels ac4d4a0f66 fixed compilation error and fixed shadow warnings 2015-12-17 16:22:15 +01:00
Niels 07033f67a5 some cleanup and more documentation 2015-12-17 15:49:33 +01:00
Niels fb972e845b show reference to source code in documentation 2015-12-16 12:10:12 +01:00
Niels 6ac89df54d fix for #127 2015-12-16 12:09:59 +01:00
Niels a615598b14 cleanup documentation; started added versions 2015-12-15 19:42:32 +01:00
Niels 1df5d726d9 undid the fix for #136 2015-12-15 18:34:07 +01:00
Niels cd04a7d3e9 fix for #133 
added value() function to get object value at given key or a default
value if key does not exist
 2015-12-15 08:38:54 +01:00
Niels 2ba901bbf6 cleanup 2015-12-14 21:23:21 +01:00
Niels 5bc1b65676 clean up (for #154) 2015-12-14 16:58:49 +01:00
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 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