From d1f4429d43448daf0b79a6b414aff7c4ad12356b Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Tue, 9 Apr 2019 13:17:16 +0100 Subject: Fix issue #18 where __cpuid identifier was macro clashing. Also update to latest Outcome. --- test/kerneltest | 2 +- test/test_kernel_decl.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/kerneltest b/test/kerneltest index a81df2c1..0d484ee0 160000 --- a/test/kerneltest +++ b/test/kerneltest @@ -1 +1 @@ -Subproject commit a81df2c15e67a69e572101e587b9a8fbc9b77569 +Subproject commit 0d484ee031fbfb26c4c4b9d838dc2263ab7b2ac2 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 using il_result = OUTCOME_V2_NAMESPACE::experimental::status_result; +template using il_result = OUTCOME_V2_NAMESPACE::experimental::status_result; #else template using il_result = LLFIO_V2_NAMESPACE::result; #endif -- cgit v1.2.3