From 9a587fadc9bc6ae8aeed3d5c2c7b488f86698f35 Mon Sep 17 00:00:00 2001 From: chatlanin Date: Sun, 23 Oct 2022 19:14:18 +0300 Subject: [PATCH] fix new hack location --- bin/main.cpp | 2 +- src/actor_impl/actor_controller.hpp | 6 +++++- subprojects/gtest.wrap | 17 ++--------------- subprojects/hack.wrap | 5 +---- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/bin/main.cpp b/bin/main.cpp index b557633..487cab2 100644 --- a/bin/main.cpp +++ b/bin/main.cpp @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) hack::log()("run example"); sorting sort; - message ms { result_t{ 1, 5, 7, 9, 2, 4, 6, 8 } }; + message ms { result_t{ 1, 5, 7, 9, 2, 4, 6, 8, 1, 5, 7, 9, 2, 4, 6, 8, 1, 5, 7, 9, 2, 4, 6, 8, 1, 5, 7, 9, 2, 4, 6, 8, 1, 5, 7, 9, 2, 4, 6, 8, 1, 5, 7, 9, 2, 4, 6, 8, 10, 13, 12, 11 } }; actorfm::actor_controller::instance().set_actor(sort); auto fut = sort.expect(ms); diff --git a/src/actor_impl/actor_controller.hpp b/src/actor_impl/actor_controller.hpp index abb0320..ef776a2 100644 --- a/src/actor_impl/actor_controller.hpp +++ b/src/actor_impl/actor_controller.hpp @@ -11,7 +11,11 @@ namespace actorfm public: actor_controller() : sch { std::make_unique() } {} - static actor_controller& instance() { static actor_controller ac; return ac; } + static actor_controller& instance() + { + static actor_controller ac; + return ac; + } template void set_actor(actor_t& actor) diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap index 730de1a..3e2e11d 100644 --- a/subprojects/gtest.wrap +++ b/subprojects/gtest.wrap @@ -1,15 +1,2 @@ -[wrap-file] -directory = googletest-release-1.11.0 -source_url = https://github.com/google/googletest/archive/release-1.11.0.tar.gz -source_filename = gtest-1.11.0.tar.gz -source_hash = b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 -patch_filename = gtest_1.11.0-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.11.0-2/get_patch -patch_hash = 764530d812ac161c9eab02a8cfaec67c871fcfc5548e29fd3d488070913d4e94 - -[provide] -gtest = gtest_dep -gtest_main = gtest_main_dep -gmock = gmock_dep -gmock_main = gmock_main_dep - +[wrap-redirect] +filename = hack/subprojects/gtest.wrap diff --git a/subprojects/hack.wrap b/subprojects/hack.wrap index 06d49f7..f90a260 100644 --- a/subprojects/hack.wrap +++ b/subprojects/hack.wrap @@ -1,6 +1,3 @@ [wrap-git] -url = https://github.com/azchatlanin/hack.git +url = https://gitcast.ru/chatlanin/hack.git revision = master - -[provide] -hack = hack_dep