Commit Graph

2333 Commits

Author SHA1 Message Date
Sebastian Messmer
981b663765 Merge branch 'feature/either3' into feature/library_intermediate 2018-12-28 09:47:57 +01:00
Sebastian Messmer
795ccd4a0b Merge branch 'feature/either2' into feature/either3 2018-12-28 09:47:37 +01:00
Sebastian Messmer
6663ffd036 fix 2018-12-28 09:47:22 +01:00
Sebastian Messmer
a1e2fc4967 Merge branch 'develop' into feature/either2 2018-12-28 09:44:32 +01:00
Sebastian Messmer
e8d791c9cf Enable TSAN for more builds 2018-12-28 09:36:48 +01:00
Sebastian Messmer
50509f84f1 Update changelog 2018-12-27 10:43:09 +01:00
Sebastian Messmer
2bae1281c6 Fix deadlock 2018-12-27 10:13:58 +01:00
Sebastian Messmer
648263d062 TSAN and omp don't work together, reduce omp thread count in tsan to 1 2018-12-26 16:46:59 +01:00
Sebastian Messmer
e1117b4f29 Merge branch 'feature/either3' into feature/library_intermediate 2018-12-26 08:26:01 +01:00
Sebastian Messmer
7021b84395 Merge branch 'feature/either2' into feature/either3 2018-12-26 08:25:43 +01:00
Sebastian Messmer
226d726fe1 Merge branch 'develop' into feature/either2 2018-12-26 08:25:17 +01:00
Sebastian Messmer
d259361ad8 Fix either_test to use optional more directly 2018-12-26 08:23:00 +01:00
Sebastian Messmer
d44cb9b4e2 Upgrade to boost 1.58 2018-12-26 08:22:39 +01:00
Sebastian Messmer
a8476a2699 Implement either<A, B> type 2018-12-26 08:19:01 +01:00
Sebastian Messmer
6177079d6a Merge branch 'feature/either3' into feature/library_intermediate 2018-12-25 19:54:36 +01:00
Sebastian Messmer
19a08d37f1 Merge branch 'feature/either2' into feature/either3 2018-12-25 19:54:21 +01:00
Sebastian Messmer
8c02968898 Merge branch 'feature/optional_fix' into feature/either2 2018-12-25 19:54:10 +01:00
Sebastian Messmer
1fdfdb3437 Change either_test to use optional correctly 2018-12-25 19:53:47 +01:00
Sebastian Messmer
b531942445 Upgrade to boost 1.58 2018-12-25 19:53:47 +01:00
Sebastian Messmer
e489ce9880 Fix for travis 2018-12-25 19:53:33 +01:00
Sebastian Messmer
a86ac8241d fix clang-tidy 2018-12-25 19:50:53 +01:00
Sebastian Messmer
b6c72a2a6c merge 2018-12-25 10:42:53 +01:00
Sebastian Messmer
8f9dcad559 Re-enable light_opt()&& and left_opt()&& 2018-12-25 10:40:46 +01:00
Sebastian Messmer
b2bcfce95a More noexcept specifiers 2018-12-25 10:35:36 +01:00
Sebastian Messmer
a81bbccf53 Change either_test to use optional correctly 2018-12-25 10:34:50 +01:00
Sebastian Messmer
2b21609190 Upgrade to boost 1.58 2018-12-25 10:34:50 +01:00
Sebastian Messmer
621b000394 fix debug builds 2018-12-25 10:34:40 +01:00
Sebastian Messmer
70a25d2cb0 try fix 2018-12-25 07:45:10 +01:00
Sebastian Messmer
9aa0dbfc19 try fix 2018-12-25 07:43:41 +01:00
Sebastian Messmer
7df156b74a try fix 2018-12-24 20:02:40 +01:00
Sebastian Messmer
15aabee1ae merge 2018-12-24 18:55:23 +01:00
Sebastian Messmer
4de6f1d8d9 Re-enable left_opt() and right_opt() for rvalue references 2018-12-24 18:54:22 +01:00
Sebastian Messmer
1b2aaf5da4 Merge 2018-12-24 18:52:48 +01:00
Sebastian Messmer
57fc1f1cb8 Merge branch 'feature/either2' into feature/library_intermediate 2018-12-24 18:35:52 +01:00
Sebastian Messmer
9246856f76 Remove own either 2018-12-24 18:35:47 +01:00
Sebastian Messmer
2878313993 More noexcept specifiers 2018-12-24 18:34:42 +01:00
Sebastian Messmer
59d6a10d28 Fix and add test cases 2018-12-24 18:15:08 +01:00
Sebastian Messmer
0444b809a2 Merge branch 'develop' into feature/either 2018-12-24 09:13:31 +01:00
Sebastian Messmer
ebecf44b40 Fix clang-tidy for either.h 2018-12-23 02:56:30 +01:00
Sebastian Messmer
fcc9d45f41 Apply a fix for Win 7 2018-12-22 10:25:47 +01:00
Sebastian Messmer
0b03326ca2 Exit after error message when run on Windows 7 2018-12-22 10:18:08 +01:00
Sebastian Messmer
b36aa1b272 More test cases for CryConfigTest 2018-12-22 01:22:43 +01:00
Sebastian Messmer
51f74a2f6a Don't crash but throw if config file can't be loaded 2018-12-22 01:22:24 +01:00
Sebastian Messmer
99688e51ab Use either<> to indicate errors in config file loading 2018-12-22 00:58:30 +01:00
Sebastian Messmer
525c29c65d Add TempFile::remove() 2018-12-22 00:54:04 +01:00
Sebastian Messmer
fcd239ac65 Merge branch 'develop' into feature/win_pre10 2018-12-18 21:41:02 -08:00
Sebastian Messmer
944cb6c3c5 Return error code when integrity violation is encountered 2018-12-18 21:40:03 -08:00
Sebastian Messmer
5d77a82c7f Fix test cases 2018-12-18 21:36:13 -08:00
Sebastian Messmer
9ebd3d754c Fix test cases 2018-12-18 21:34:20 -08:00
Sebastian Messmer
cefba055a0 Merge branch 'develop' of github.com:cryfs/cryfs into develop 2018-12-18 21:23:34 -08:00