wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-09 16:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
922 Commits 19 Branches 57 Tags
804160e6599cac1773acbeee00a0fddcc2df5c2a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels 804160e659 Merge branch 'develop' into coverity_scan 2016-06-19 22:39:05 +02:00
Niels 15a314abea updated README 2016-06-19 22:38:54 +02:00
Niels 0865ec87d4 re-added GCC6 2016-06-19 22:20:02 +02:00
Niels 3fe654e827 fix for coverity 2016-06-19 22:12:56 +02:00
Niels 3948021b6c Merge branch 'develop' into coverity_scan 2016-06-19 22:07:16 +02:00
Niels 20e4b20528 fix SSL issue with coverity 2016-06-19 21:57:32 +02:00
Niels 550475b5e1 Merge branch 'develop' into coverity_scan 2016-06-19 18:33:46 +02:00
Niels 8c48ef1f73 updated to Catch v1.5.6 2016-06-19 18:25:43 +02:00
Niels 4ff27b207e fixed two typos 2016-06-19 17:56:58 +02:00
Niels 4e31a0e852 minor doc changes 2016-06-19 16:17:53 +02:00
Niels 039565b9f5 trying codecov 2016-06-18 14:33:29 +02:00
Niels bb8c7b1f45 mentioning Homebrew's --HEAD parameter 2016-06-15 21:28:27 +02:00
Niels 1eced269e3 update after PR #266 2016-06-14 15:27:21 +02:00
Niels 9eb86e1e12 Merge pull request #266 from 06needhamt/Issue 
Fix Issue #265
 2016-06-14 15:24:49 +02:00
Niels 39213bf34e Merge branch 'feature/issue260' into develop 2016-06-14 08:28:36 +02:00
Niels 44b210aa77 Merge branch 'develop' into feature/issue260 2016-06-14 08:23:09 +02:00
Niels c744d59f2d adjusted README file to reality in Travis 2016-06-14 08:14:25 +02:00
Niels 947db6ffe3 added Xcode 8 beta 2016-06-14 08:02:29 +02:00
Niels 494cc15650 Merge branch 'develop' into feature/issue260 2016-06-07 12:13:03 +02:00
Niels 48f69f40e7 enough for today... 2016-06-07 12:04:57 +02:00
Niels 97648314a4 setting explicit path to compiler 2016-06-07 11:52:12 +02:00
Niels 439563eb04 export 2016-06-07 11:42:34 +02:00
Niels 19be324f87 ? 2016-06-07 11:38:56 +02:00
Niels 3f23e70598 another try 2016-06-07 11:36:03 +02:00
Niels 62f39c41ec another try 2016-06-07 11:29:37 +02:00
Niels c425dc9e04 trying to install clang 2016-06-07 11:25:00 +02:00
Niels a4058b88ec another test 2016-06-07 11:14:02 +02:00
Niels ff8f196ca3 a test 2016-06-07 11:13:15 +02:00
Niels 31b24dd5c1 adding more Clang versions 2016-06-07 11:02:45 +02:00
Niels cc5cad5b0b another try 2016-06-07 10:53:18 +02:00
Niels 1f04c0349a readded -lc++ 2016-06-07 10:03:18 +02:00
Niels a97c998791 removed -lc++ 2016-06-07 09:50:43 +02:00
Niels 6d19bd1108 Revert "another try" 
This reverts commit f63317dce3.
 2016-06-07 09:49:11 +02:00
Niels f63317dce3 another try 2016-06-07 09:34:46 +02:00
Niels 32cc6fefcc another try 2016-06-07 09:12:53 +02:00
Niels fbbdcb19bc another try 2016-06-07 09:01:49 +02:00
Niels dd10c89a3e another try 2016-06-07 08:53:36 +02:00
Niels dd542aae7d another try 2016-06-07 08:40:25 +02:00
Niels 761880f5b7 CPATH does not work... 2016-06-07 08:32:56 +02:00
Niels 1826d12a22 added CPATH 2016-06-07 08:28:50 +02:00
Niels dfc39b95ab clang does not work with travis right now 2016-06-07 07:54:00 +02:00
Niels 32f6682177 another try 2016-06-07 07:25:11 +02:00
Niels f4ae8f8e2e another try 2016-06-07 07:21:17 +02:00
Niels e772f06f0d another try 2016-06-07 07:14:54 +02:00
Niels 5173c16222 another try 2016-06-07 07:07:42 +02:00
Niels 744bae7fc4 trying to fix Travis 2016-06-07 07:00:31 +02:00
Niels 9e2dfd19e8 minor cleanup 2016-06-07 00:20:53 +02:00
Niels b508d1f1c4 fix proposal for #260 2016-06-06 18:50:39 +02:00
Niels d4ff1bbaec Merge branch 'develop' into coverity_scan 2016-05-29 14:56:36 +02:00
Niels 04e1e7b586 cleanup 2016-05-29 14:56:08 +02:00
Niels 5666bd0e2d Merge branch 'develop' into coverity_scan 2016-05-29 14:06:54 +02:00
Niels aa8aa3ba9f overworked coverity stuffy 2016-05-29 14:06:43 +02:00
Niels 03db7b0dbb Merge branch 'develop' into coverity_scan 2016-05-29 13:32:48 +02:00
Niels 6bdb883b5c ignore build errors for coverity-scan 2016-05-29 13:32:36 +02:00
Niels 53603500ed Merge branch 'develop' into coverity_scan 2016-05-29 13:06:40 +02:00
Niels c0b2c6ea5d removing beta-xcode6.3 for now 2016-05-29 13:06:27 +02:00
Niels 97ea5ae403 Merge branch 'develop' into coverity_scan 2016-05-29 12:57:30 +02:00
Niels 6fed416125 fixed used compiler 2016-05-29 12:57:09 +02:00
Niels b26582c0e9 another try for coverity-scan 2016-05-29 12:29:46 +02:00
Niels 1cc77a5fe5 another try for coverity-scan 2016-05-29 12:15:13 +02:00
Niels 91dfc723be added coverity_scan 2016-05-29 12:07:20 +02:00
Niels 7bdfde4493 added a note about different NDKs (see #219) 2016-05-28 16:06:41 +02:00
Niels 71a7746ccb removed a line 2016-05-25 21:55:03 +02:00
Niels a3f432b3dd added hint to Homebrew 2016-05-18 22:23:35 +02:00
Niels 25d60b7bab Merge pull request #247 from robertmrk/feature/cmake-cleanup 
Define CMake/CTest tests
 2016-05-18 22:20:45 +02:00
Niels 837617122a fixed #246 2016-05-18 22:17:08 +02:00
Niels 0a393b8374 indentation cleanup 2016-05-12 07:34:36 +02:00
Niels 0e0ecb2c14 fixed a warning and update ChangeLog 2016-05-12 00:32:18 +02:00
Niels fb06356856 thanks 2016-05-11 20:58:11 +02:00
Niels 888d022573 Merge pull request #242 from ChrisKitching/outOfTree 
Out of tree builds and a few other miscellaneous CMake cleanups.
 2016-05-11 20:52:45 +02:00
Niels f1e61896fb fixed a shadow error 2016-05-11 18:43:12 +02:00
Niels db5c9ec9ba fixed issue #239 (-Wconversion warnings) 2016-05-11 17:25:59 +02:00
Niels 91aa4c9def Merge branch 'develop' into feature/issue239 2016-05-11 17:23:01 +02:00
Niels 9ecf83f630 working on #235 2016-05-08 20:28:20 +02:00
Niels 6d8e00ade8 another try to remove a warning 2016-05-08 17:17:17 +02:00
Niels ac3036dc0f Merge branch 'develop' into feature/issue239 2016-05-08 17:07:08 +02: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
Niels 9073b2ca39 hopefully removed some warnings 2016-04-30 16:22:27 +02:00
Niels ea84a85b13 simplified flatten/unflatten examples 2016-04-30 10:39:03 +02: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
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
Niels 62f81a60d7 hopefully fixed a warning 2016-04-29 21:23:13 +02: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