wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-06 15:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
949 Commits 19 Branches 57 Tags
bd7cd330cddb78fd873e10f2d46bb16a47bfe947
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels bd7cd330cd fixed type_name() signature 2016-07-01 17:26:09 +02:00
Niels 28644bada0 removed std::out output from test cases 2016-07-01 17:25:56 +02:00
Niels 6e1347e68c fixes #270 2016-07-01 16:58:50 +02:00
Niels 814fb31d64 Merge pull request #275 from dtoma/develop 
Update hexify to use array lookup instead of ternary (#270)
 2016-07-01 16:51:35 +02:00
Niels 7ffa07e3a3 update of ChangeLog 2016-06-28 21:46:53 +02:00
Niels d2475f9010 bumped version number 2016-06-28 21:44:03 +02:00
Niels 3d4c79922e Merge branch 'release/2.0.1' into develop 2016-06-28 21:38:59 +02:00
Niels 026fe8041d adjusted Changelog 2016-06-28 21:33:34 +02:00
Niels a73bda8147 fixed performance regression #272 2016-06-28 21:24:18 +02:00
Niels 6a108bb84b Merge branch 'feature/issue272' into develop 2016-06-28 21:19:36 +02:00
Niels 7214243d89 reset locale (for #272) 2016-06-28 19:18:23 +02:00
Niels 420659f187 addressing #272 2016-06-28 10:42:17 +02:00
Niels 360f0f3791 updated README and ChangeLog 2016-06-24 17:39:03 +02:00
Niels c74b9ff4f7 another fix for the MSVC version 2016-06-24 17:15:54 +02:00
Niels a61231ad29 Merge pull request #271 from thelostt/patch-1 
fixed a tiny typo
 2016-06-24 11:28:01 +02:00
Niels 0767290c26 off-by-one error in the documentation 2016-06-24 08:06:41 +02:00
Niels ca2bbdb15b clarified MSV version 2016-06-24 07:39:08 +02:00
Niels 1c719561b0 update of documentation links 2016-06-24 00:14:27 +02:00
Niels b3cf45c8f5 updated release information 2016-06-23 23:34:41 +02:00
Niels 6542ae5766 fixed re2c warnings 2016-06-23 22:49:48 +02:00
Niels 39a9cfcc12 updated README 2016-06-23 18:08:20 +02:00
Niels f86fe57c18 Merge branch 'feature/undo-number-roundtrip' into develop 2016-06-23 18:00:06 +02:00
Niels 04a80a8f60 Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-23 05:57:41 +02:00
Niels 3497fab3b5 cleanup 2016-06-23 05:55:48 +02:00
Niels d14366c33e Merge branch 'feature/issue269' into develop 2016-06-23 00:05:01 +02:00
Niels 7cff6c8771 Merge branch 'develop' into feature/issue269 
# Conflicts:
#	README.md
 2016-06-23 00:04:55 +02:00
Niels 6f76c9237b overworked ChangeLog and README 2016-06-22 22:20:55 +02:00
Niels ecf84dddb1 test case for #269 2016-06-22 20:40:15 +02:00
Niels 59e67e768f fix for previous commit 2016-06-22 20:09:06 +02:00
Niels 3f97a5d5ad a conceptual quick fix for #269 2016-06-22 20:05:44 +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 20e4b20528 fix SSL issue with coverity 2016-06-19 21:57:32 +02:00
Niels 90b46868b5 Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-19 18:27:07 +02:00
Niels 8c48ef1f73 updated to Catch v1.5.6 2016-06-19 18:25:43 +02:00
Niels b47fdf88ee Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-19 17:59:53 +02:00
Niels 4ff27b207e fixed two typos 2016-06-19 17:56:58 +02:00
Niels ad7a419a03 removed roundtripping of floats (#230) 2016-06-19 17:13:13 +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 04e1e7b586 cleanup 2016-05-29 14:56:08 +02:00
Niels aa8aa3ba9f overworked coverity stuffy 2016-05-29 14:06:43 +02:00
Niels 6bdb883b5c ignore build errors for coverity-scan 2016-05-29 13:32:36 +02:00
Niels c0b2c6ea5d removing beta-xcode6.3 for now 2016-05-29 13:06:27 +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