From 98c56fa0e37e489fab3a10baa5413aca4a6bc447 Mon Sep 17 00:00:00 2001 From: glensand Date: Thu, 17 Feb 2022 13:51:49 +0700 Subject: [PATCH 1/2] fixed some spelling mistakes --- lib/hope/typelist/type_value_map.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/hope/typelist/type_value_map.h b/lib/hope/typelist/type_value_map.h index 379b536..d24ea10 100644 --- a/lib/hope/typelist/type_value_map.h +++ b/lib/hope/typelist/type_value_map.h @@ -10,9 +10,6 @@ #include "hope/typelist/type_list.h" #include "hope/tuple/flat_tuple.h" -#include -#include -#include namespace hope { @@ -50,8 +47,8 @@ namespace hope { m_map.for_each([](auto&& pair){ using pair_t = std::decay_t; static_assert(is_type_value_v, - "HOPE STATIC ASSRTATION FAILED:" - "Onve of the arguments is not an instance of the hope::type_value structure." + "HOPE STATIC ASSERTION FAILED:" + "One of the arguments is not an instance of the hope::type_value structure." "hope::type_value_map is intended to work only with hope::type_value." "Wrap your key and value to it and try to compile again." ); @@ -62,7 +59,7 @@ namespace hope { decltype(auto) get() const { constexpr static auto idx = index(); static_assert(idx < size(type_list{}), - "HOPE STATIC ASSRTATION FAILED:" + "HOPE STATIC ASSERTION FAILED:" "Given type is not present in the specified type - value map" ); @@ -73,7 +70,7 @@ namespace hope { void set(TValue&& val){ using pair_t = type_value>; static_assert(contains(type_list{}), - "HOPE STATIC ASSRTATION FAILED:" + "HOPE STATIC ASSERTION FAILED:" "Given combination of key type and value type is not present in type value map" ); auto&& containing_value = m_map.template get(); From f4b5abff727a88af30f27adbbd01fb94cdb6b18e Mon Sep 17 00:00:00 2001 From: glensand Date: Thu, 17 Feb 2022 17:25:32 +0700 Subject: [PATCH 2/2] master -> main for googletest --- test/CMakeLists.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt.in b/test/CMakeLists.txt.in index f98ccb4..226cf8c 100644 --- a/test/CMakeLists.txt.in +++ b/test/CMakeLists.txt.in @@ -5,7 +5,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG master + GIT_TAG main SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND ""