Commit Graph

73 Commits (f6b4188933d0a68839989044a9bdd80b806ab56d)
 

Author SHA1 Message Date
Zhijiang TAO f6b4188933 添加int64类型,但是还是会溢出 7 years ago
Andrew Twyman 787809178d Merge pull request #71 from admsyn/fix-cmake-c++11-flag 7 years ago
Adam Carlucci 580fd44b5f Use CXX_STANDARD to specify c++11 compile flags 7 years ago
Andrew Twyman fb6cc808e0 Merge pull request #69 from dropbox/atwyman/pre-processor-customization 7 years ago
Andrew Twyman 7a947c1e2f Remove extraneous parentheses 7 years ago
Andrew Twyman 200c98aede Allow json11 tests to be customized with pre-processor defines 7 years ago
Andrew Twyman 78e43a9ea7 Merge pull request #68 from AustinBrunkhorst/master 7 years ago
Austin Brunkhorst 40f10bd28d Use `false` instead of `0` + conversion. 7 years ago
Andrew Twyman d9867d8ab3 Merge pull request #66 from 4brunu/master 7 years ago
Austin Brunkhorst 467dc6ae05 Fixes warning C4800: 'int': forcing value to bool 'true' or 'false' on MSVC 14 7 years ago
Bruno Coelho 3704671508 Add option to disable unit tests 7 years ago
Andrew Twyman 913269c7a4 Merge pull request #64 from shrikant-dropbox/master 7 years ago
Shrikant Kelkar f6c0f68737 MSVS 2013 compatibility changes. 7 years ago
Andrew Twyman a20878aaa5 Make the DR1467 canary test code optional 7 years ago
Andrew Twyman 4597f98abe Fix sign comparison warnings, and parser confusion 7 years ago
j4cbo df1fdbfd79 Merge pull request #57 from ChrisKitching/fixpkgconfigInstall 7 years ago
Chris Kitching 05b5514400
Don't assume in-tree builds when installing json11.pc 7 years ago
j4cbo 8452587160 Merge pull request #55 from Dushistov/parse_not_full_json 7 years ago
j4cbo a1409a9a1a Merge pull request #56 from Dushistov/json_parser_anonymous 7 years ago
Evgeniy A. Dushistov 0e4ace7e40 make parser invisible from outside 7 years ago
Evgeniy A. Dushistov 33bca8e178 implement parsing of chunked json 7 years ago
Andrew Twyman eefbd630ec Merge pull request #53 from njwhite/master 7 years ago
Nick White 8076ba74e0 Generate pkg-config File & Add Install 7 years ago
Andrew Twyman 3ae180068d Merge pull request #52 from kirisetsz/master 7 years ago
kirisetsz 5e664c99d8 Update CMakeLists to 3.x style 7 years ago
j4cbo afcc8d0d82 Merge pull request #47 from PSPDFKit-labs/fix-warnings 7 years ago
Peter Steinberger e1d5bcc94d This fixes a “No previous prototype for function” warning. 7 years ago
Andrew Twyman a6a661e924 Merge pull request #42 from capitalaslash/detect_comments 7 years ago
Antonio Cervone ebc3a6b038 watch out for i+1 to overflow the buffer 7 years ago
Antonio Cervone 988a8fc249 make JsonParser::strategy const 7 years ago
Antonio Cervone 49a6197d08 use an enum to select strategy on comment parsing 7 years ago
Antonio Cervone f9833b1e7d add test for unfinished multi-line comment 7 years ago
Antonio Cervone c6c6fcfeff add test for inline comment without trailing newline 7 years ago
Antonio Cervone aa270ad5b7 fix test where the trailing / was not reached due to a previous error 7 years ago
Antonio Cervone 982b2d8885 improve testing for bad inline comments 7 years ago
Antonio Cervone 4b0f5cfd77 check for end of input on every increment of the cursor 7 years ago
Antonio Cervone f21b8c360e add malformed comment tests. 7 years ago
Antonio Cervone d292fce9f2 improve comment test. 7 years ago
Antonio Cervone 2f5c64225d detect malformed comments 7 years ago
Antonio Cervone b05e655c0a detect multiple comments with a loop instead of using recursion 7 years ago
Antonio Cervone 882feb56ac add bool to detect comments as run-time option. 7 years ago
Antonio Cervone de098c4d52 add testing for comment functionality 7 years ago
Antonio Cervone 08c391f89a introduce consume_garbage() 7 years ago
Antonio Cervone 2d1d176a55 add routine to detect c-style comments 7 years ago
j4cbo 765cee3ed1 Merge pull request #39 from PollRobots/use-cmake 7 years ago
j4cbo b1e78cb1e4 Merge pull request #40 from PollRobots/fix-stdin-test 8 years ago
Paul C Roberts a021c3fbe2 Fixes bug in parse_from_stdin 8 years ago
Paul C Roberts 0c6e9d77a4 Add cmake support 8 years ago
Andrew Twyman 61ba0a1dd2 Make test.cpp compilable with GCC. 8 years ago
Andrew Twyman 50ed8c90e5 Test to demonstrate compiler behavior change in Xcode 7 / clang 3.7. 8 years ago