Commit Graph

849 Commits

Author SHA1 Message Date
Cameron Druyor
864fb58bf7 Merge 2e4d493926 into fadf286653 2016-05-08 14:19:17 +00:00
Niels
fadf286653 added test case for std::bad_alloc 2016-05-08 14:35:32 +02:00
Niels
85a30813c8 removed unnecessary code (numbers must not begin with "+") 2016-05-07 20:22:58 +02:00
Niels
688cd49bdc Merge branch 'feature/json-patch' into develop 2016-05-07 18:41:02 +02:00
Niels
c04275966f improved test coverage 2016-05-07 18:33:43 +02:00
Cameron T. Druyor
2e4d493926 refactored into one line to satisfy lcov 2016-04-30 13:44:36 -04:00
Cameron T. Druyor
fbcf15098f forgot to make re2c 2016-04-30 12:51:46 -04:00
Cameron T. Druyor
223793caa0 to get rid of exception that was leftover from debugging 2016-04-30 12:49:42 -04:00
Cameron T. Druyor
31493c39b0 to add parentheses to satisfy clang 2016-04-30 12:30:36 -04:00
Cameron T. Druyor
f115199290 fix comment 2016-04-30 12:28:09 -04:00
Cameron T. Druyor
372c6dd790 I accidentally wiped the makefile before, so now I'm putting it back. 2016-04-30 12:25:30 -04:00
Niels
ea84a85b13 simplified flatten/unflatten examples 2016-04-30 10:39:03 +02:00
Cameron T. Druyor
8468750409 After realizing how the lexer code generation works, I went back and made my changes to json.hpp.re2c as I should have.
Tests back to green, with no direct edits to json.hpp
2016-04-29 20:44:51 -04:00
Niels
a21f8b0c77 added AppVeyor information 2016-04-30 01:21:35 +02:00
Niels
9170740f45 added documentation on Travis compilers 2016-04-30 01:01:41 +02:00
Cameron T. Druyor
faa5a4d0f8 Merge branch 'develop' of https://github.com/Kamtron/json into develop 2016-04-29 18:48:20 -04:00
Niels
7c04bc3db6 added name call 2016-04-30 00:43:33 +02:00
Niels
be16d005e4 get compiler versions 2016-04-30 00:25:11 +02:00
Niels
f4ecceab19 cleanup 2016-04-30 00:12:19 +02:00
Niels
1d3b4dd158 added test cases 2016-04-30 00:03:47 +02:00
Cameron T. Druyor
25ba51ec00 updating to better match the style of the rest of the codebase 2016-04-29 17:10:36 -04:00
Cameron T. Druyor
3beff40c37 to get rid of debugging helper functions 2016-04-29 16:49:04 -04:00
Cameron T. Druyor
e2163c36b5 to add diabolical test case with trailing zeros and no radix point 2016-04-29 16:48:05 -04:00
Niels
82f5332cf4 Merge branch 'develop' into feature/json-patch 2016-04-29 20:50:34 +02:00
Niels
74544b42af removed MinGW compiler (too old) 2016-04-29 20:48:47 +02:00
Niels
c019088d3b wrong MinGW binary 2016-04-29 20:35:40 +02:00
Niels
b685737d53 added MinGW 2016-04-29 20:18:20 +02:00
Niels
ddc5442c91 cleanup 2016-04-29 20:09:41 +02:00
Niels
a07cdb14ec don't install valgrind for OSX 2016-04-29 20:01:11 +02:00
Niels
40abeb28d5 Valgrind only for Linux 2016-04-29 20:00:33 +02:00
Niels
68c50073a4 added OSX 2016-04-29 19:46:37 +02:00
Niels
ca604c5a2e trying Clang 3.9 2016-04-29 19:37:52 +02:00
Niels
86d7e3090f removed GCC 6, added Clang 3.5 2016-04-29 19:33:43 +02:00
Niels
e35805cf3a added GCC 6 and Clang 3.8 to Travis 2016-04-29 19:29:02 +02:00
Cameron T. Druyor
cd2e559efd added a helper function to make it easier to identify issue 230 at different execution points. 2016-04-28 22:43:11 -04:00
Cameron T. Druyor
3fed057513 Just poking around right now. 2016-04-28 17:49:14 -04:00
Niels
86debab3b1 Merge branch 'develop' into feature/json-patch 2016-04-26 20:43:02 +02:00
Niels
9af8f7d094 update after #238 2016-04-26 20:38:01 +02:00
Niels
7dc07b75de Merge branch 'develop' into feature/json-patch 2016-04-26 20:32:24 +02:00
Niels
0f64761663 Merge pull request #238 from robertmrk/cmake-package
Implement additional integration options
2016-04-26 20:31:19 +02:00
Niels
5e0bf75d60 cleanup, test, and diff 2016-04-25 23:17:04 +02:00
Robert Marki
192a692034 Generate package config files in cmake's current binary directory
Generate the config files of the package in CMAKE_CURRENT_BINARY_DIR
instead of CMAKE_BINARY_DIR because the later will refer to the main
project's binary directory if the library is included in the project
using the add_subdirectory command.
2016-04-25 11:55:03 +02:00
Robert Marki
b1a2e9a715 Create an install target for the project
- define the project's version in the cmake listfile
- create a config and config version file for the cmake package
- install the json.hpp file and the package's targets, config and
config version files
2016-04-25 10:27:19 +02:00
Robert Marki
30e396043a Export library target and store build directory in package registry 2016-04-25 09:36:05 +02:00
Robert Marki
28f73ed406 Refactor CMake listfile to define an interface imported library
Define the library as an interface imported library so other targets
can use the library as a dependency and use the interface properties
of the library.
2016-04-24 19:56:20 +02:00
Niels
96cfe7463f fixed some warnings 2016-04-24 19:09:12 +02:00
Niels
8d4cf5ef8d oops 2016-04-24 19:04:10 +02:00
Niels
fb54e212b6 clean up and added tests 2016-04-24 19:03:33 +02:00
Niels
09e9f6dcd4 implemented "move" 2016-04-24 17:43:27 +02:00
Niels
855cf2307b extended "add" to cope with arrays 2016-04-24 16:51:06 +02:00