From d91bb80aed0ccd60b2194401f42df77661319f74 Mon Sep 17 00:00:00 2001 From: Mitama Date: Thu, 18 Jul 2019 03:36:11 +0900 Subject: [PATCH] update submodules --- catch2 | 2 +- mitama-cpp-result | 2 +- tests/basic-tests/basic-tests.cpp | 10 +++++----- tests/test_include/test_util.hpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/catch2 b/catch2 index 08147a23..03ffc101 160000 --- a/catch2 +++ b/catch2 @@ -1 +1 @@ -Subproject commit 08147a23f923103c87d1eac3dc30a9ecc4a753c4 +Subproject commit 03ffc1014cb854ea29565d24f3c6c4e133f7c10e diff --git a/mitama-cpp-result b/mitama-cpp-result index f0a847a8..fa3a9339 160000 --- a/mitama-cpp-result +++ b/mitama-cpp-result @@ -1 +1 @@ -Subproject commit f0a847a8515cca20c15a3eb4f6b0c97981a285da +Subproject commit fa3a9339812d7bfe9c80c10c0c7ba4b76e44d27c diff --git a/tests/basic-tests/basic-tests.cpp b/tests/basic-tests/basic-tests.cpp index c3aa20bc..3fc4ea05 100644 --- a/tests/basic-tests/basic-tests.cpp +++ b/tests/basic-tests/basic-tests.cpp @@ -29,15 +29,15 @@ TEMPLATE_TEST_CASE("validates", "[quantity][validate]", second_t, meter_t, ampere_t, candela_t, kelvin_t, kilogram_t, mol_t) { - auto validator = [](auto v) -> mitama::Result, int> { + auto validator = [](auto v) -> mitama::result, int> { if (v.value() < 0) - return mitama::Err(v.value()); + return mitama::failure(v.value()); else - return mitama::Ok(v); + return mitama::success(v); }; - REQUIRE( (1|TestType{}).validate(validator) == Ok(1|TestType{}) ); - REQUIRE( (-1|TestType{}).validate(validator) == Err(-1) ); + REQUIRE( (1|TestType{}).validate(validator) == mitama::success(1|TestType{}) ); + REQUIRE( (-1|TestType{}).validate(validator) == mitama::failure(-1) ); } #include diff --git a/tests/test_include/test_util.hpp b/tests/test_include/test_util.hpp index bbd3e478..184e4d69 100644 --- a/tests/test_include/test_util.hpp +++ b/tests/test_include/test_util.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #define IS_INVALID_EXPR(...) \ IS_INVALID_EXPR_IMPL1(__VA_ARGS__) \