diff options
author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-04-09 15:17:16 +0300 |
---|---|---|
committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-04-09 15:17:16 +0300 |
commit | d1f4429d43448daf0b79a6b414aff7c4ad12356b (patch) | |
tree | 1dc02145ce058426133fe823dbc7a04577adcb0a /test | |
parent | 554a740c9a23869596b012cfd4195bd19bc421db (diff) |
Fix issue #18 where __cpuid identifier was macro clashing. Also update to latest Outcome.
Diffstat (limited to 'test')
m--------- | test/kerneltest | 0 | ||||
-rw-r--r-- | test/test_kernel_decl.hpp | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/test/kerneltest b/test/kerneltest -Subproject a81df2c15e67a69e572101e587b9a8fbc9b7756 +Subproject 0d484ee031fbfb26c4c4b9d838dc2263ab7b2ac diff --git a/test/test_kernel_decl.hpp b/test/test_kernel_decl.hpp index 52f7c0af..95fde2b3 100644 --- a/test/test_kernel_decl.hpp +++ b/test/test_kernel_decl.hpp @@ -39,7 +39,7 @@ Distributed under the Boost Software License, Version 1.0. #include "outcome/include/outcome/experimental/status-code/include/iostream_support.hpp" // Used for initialiser list stored results as the erased form is move-only -template <class T> using il_result = OUTCOME_V2_NAMESPACE::experimental::status_result<T, typename SYSTEM_ERROR2_NAMESPACE::generic_code::domain_type>; +template <class T> using il_result = OUTCOME_V2_NAMESPACE::experimental::status_result<T, SYSTEM_ERROR2_NAMESPACE::generic_code>; #else template <class T> using il_result = LLFIO_V2_NAMESPACE::result<T>; #endif |