mirror/json11
2
0
Fork 0
mirror of https://github.com/dropbox/json11.git synced 2024-12-15 08:50:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
108 Commits 1 Branch 1 Tag 269 KiB
d68527c539
Commit Graph

108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
akira-miasato
d68527c539 Remove VERSION temporarily 2017-04-27 14:58:55 -03:00
akira-miasato
e19ef2bb84 Add compatibility with older 2.8 version of CMake 
Some legacy systems (Ubuntu 14.04, RHEL7.2) have older versions of CMake.
 2017-04-26 15:05:25 -03:00
j4cbo
a147e63f3d Merge pull request #104 from rressi/master 
operator== could be faster by checking node identity
 2017-04-25 22:54:40 -06:00
Riccardo Ressi
42e6e71abb Extending identity check also to Json::operator< 2017-04-23 10:52:52 +02:00
Riccardo Ressi
dabb88e83e operator== could be faster by checking node identity 2017-04-23 10:15:39 +02:00
Andrew Twyman
db00e9369a Merge pull request #96 from jnguyen75/fix-windows-compile 
Fix MSVC Compilation: Add MSVC warning flags
 2017-04-11 13:26:10 -07:00
Andrew Twyman
f450ff39db Merge pull request #102 from dropbox/atwyman/comment_error_handling 
Improve comment error handling
 2017-04-03 15:42:01 -07:00
Andrew Twyman
3bafee93e6 Improve handling of errors in comments, and make comment tests self-checking. 
This fixes a bug where trailing inline comments were rejected, and also several cases where comment parsing would fail, but the overall parser would return a non-null value.

Fixes #101
 2017-04-03 15:41:07 -07:00
Andrew Twyman
0e409dca35 Merge pull request #97 from 4brunu/master 
Disable build tests by default in CMake
 2017-02-17 16:45:19 -08:00
Bruno Coelho
bb7a75369e revert Makefile 2017-02-17 10:00:01 +00:00
Bruno Coelho
44944359c8 Disable build tests by default in CMake and enable them in make file 2017-02-16 17:35:24 +00:00
Andrew Twyman
7a2a1feeea Merge pull request #95 from Pfeifenjoy/master 
CMake: installation if json11 is added as a library works now
 2017-02-14 21:56:52 -08:00
Jimmy Nguyen
067fd4934b Refactored warning flag checks to use CheckCXXCompilerFlag module since Windows can compile without MSVC 2017-02-07 11:54:10 -08:00
Arwed Mett
d3f504d58c see https://github.com/dropbox/json11/pull/95#issuecomment-277693953 2017-02-07 20:32:23 +01:00
Jimmy Nguyen
3d69faa498 Add MSVC warning flags 2017-02-06 17:10:38 -08:00
Arwed Mett
149c5021fc installation if json11 is added as a library works now 2017-01-31 00:09:26 +01:00
Andrew Twyman
22ef927632 Merge pull request #94 from dropbox/revert-93-buckbuild 
Revert "adds buckfile"
 2017-01-19 23:25:22 -08:00
Andrew Twyman
ec3f733d38 Revert "adds buckfile" 2017-01-19 23:19:47 -08:00
Andrew Twyman
8adf82f3dc Merge pull request #93 from nikhedonia/buckbuild 
adds buckfile
 2017-01-19 21:56:57 -08:00
Gaetano Checinski
20e2ba8b3d sets header_namespace 2017-01-19 14:05:50 +00:00
Gaetano Checinski
b7f6e6bf41 adds buckfile 2017-01-19 11:46:01 +00:00
Andrew Twyman
bf6316cf43 Merge pull request #92 from j4cbo/master 
Use an empty struct instead of nullptr_t to represent null.
 2017-01-17 17:28:12 -08:00
Jacob Potter
07fe488804 Use an empty struct instead of nullptr_t to represent null. 
Fixes #91.
 2017-01-17 17:05:41 -08:00
Andrew Twyman
8d7936d757 Merge pull request #90 from njwhite/master 
don't override CMAKE_INSTALL_PREFIX if specified
 2017-01-13 15:36:17 -08:00
Nick White
f6b4989d3b don't override CMAKE_INSTALL_PREFIX if specified 2017-01-12 18:03:09 +00:00
Andrew Twyman
a501d06b98 Merge pull request #72 from admsyn/feature-cmake-dr1467-canary 
Add cmake option for DR1467 canary tests
 2016-12-27 18:36:36 -08:00
Adam Carlucci
6de8cacf3c default to OFF for DR1467 canary test 2016-12-27 18:28:00 -08:00
Adam Carlucci
42ce09babf add cmake option for dr1467 canary tests 2016-12-27 18:28:00 -08:00
Andrew Twyman
649b54ae28 Merge pull request #76 from hhony/master 
CMakeLists: avoid LD errors, use -fPIC
 2016-12-27 14:13:49 -08:00
Andrew Twyman
d232477cfd Disable DR1467 canary by default. 
It's been long enough, an the standards committee seems unlikely enough to act that we need to consider this issue to be normal behavior.  It's more important that new users of the library have something they can compile and run successfully the first time.
See #86 for more details.
 2016-12-22 17:41:07 -08:00
Andrew Twyman
887c6b1410 Unsigned size type 2016-12-22 17:37:20 -08:00
Andrew Twyman
bb0e389ffd Merge pull request #79 from vovoid/master 
Fixed a type conversion warning
 2016-10-06 14:26:22 -07:00
Jonatan "jaw" Wallmander
330956a47d better handling of fail template in returning char 2016-10-06 09:53:49 +02:00
Jonatan "jaw" Wallmander
5d223b36ee Fixed a type conversion warning 2016-10-01 17:31:51 +02:00
hhony
f6b2731f2b CMakeLists: pkgconfig: stage for architecture specific compile/install 2016-09-07 17:33:00 -07:00
hhony
ba5c850b59 CMakeLists: avoid LD errors library should be compiled as position independent code 2016-09-07 17:22:50 -07:00
Andrew Twyman
787809178d Merge pull request #71 from admsyn/fix-cmake-c++11-flag 
Use CXX_STANDARD to specify c++11 compile flags
 2016-08-12 17:10:09 -07:00
Adam Carlucci
580fd44b5f Use CXX_STANDARD to specify c++11 compile flags 2016-08-10 18:16:59 -07:00
Andrew Twyman
fb6cc808e0 Merge pull request #69 from dropbox/atwyman/pre-processor-customization 
Allow json11 tests to be customized with pre-processor defines
 2016-07-28 22:54:22 -07:00
Andrew Twyman
7a947c1e2f Remove extraneous parentheses 2016-07-28 22:42:01 -07:00
Andrew Twyman
200c98aede Allow json11 tests to be customized with pre-processor defines 2016-07-28 22:27:43 -07:00
Andrew Twyman
78e43a9ea7 Merge pull request #68 from AustinBrunkhorst/master 
[MSVC 14] int to bool conversion performance warning
 2016-07-25 17:30:21 -07:00
Austin Brunkhorst
40f10bd28d Use false instead of 0 + conversion. 2016-07-25 17:28:15 -07:00
Andrew Twyman
d9867d8ab3 Merge pull request #66 from 4brunu/master 
Add option to disable unit tests
 2016-07-25 17:00:35 -07:00
Austin Brunkhorst
467dc6ae05 Fixes warning C4800: 'int': forcing value to bool 'true' or 'false' on MSVC 14 2016-07-24 11:34:17 -07:00
Bruno Coelho
3704671508 Add option to disable unit tests 2016-07-05 15:37:44 +01:00
Andrew Twyman
913269c7a4 Merge pull request #64 from shrikant-dropbox/master 
MSVS 2013 compatibility changes.
 2016-06-20 17:58:44 -07:00
Shrikant Kelkar
f6c0f68737 MSVS 2013 compatibility changes. 2016-06-20 17:36:17 -07:00
Andrew Twyman
a20878aaa5 Make the DR1467 canary test code optional 2016-05-18 18:36:58 -07:00
Andrew Twyman
4597f98abe Fix sign comparison warnings, and parser confusion 2016-05-18 18:31:52 -07:00