兼容gcc 10的concept

CMakeLists.txt

@@ -8,7 +8,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 	set(CMAKE_CXX_FLAGS "/std:c++latest /await /EHsc")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-	set(CMAKE_CXX_FLAGS "-std=c++2a -fcoroutines")
+	set(CMAKE_CXX_FLAGS "-std=c++2a -fcoroutines -fconcepts-diagnostics-depth=8")
 endif()
 
 if (UNIX)
@@ -27,6 +27,7 @@ else()
 endif()
 
 
+message(STATUS "Compiler: ${CMAKE_CXX_COMPILER_ID}")
 message(STATUS "C++ flags: ${CMAKE_CXX_FLAGS}")
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
@@ -42,7 +43,7 @@ endif()
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 	option(OPT_USE_CONCEPT "Use conecpt instead of enable_if" ON)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-	option(OPT_USE_CONCEPT "Use conecpt instead of enable_if" OFF)
+	option(OPT_USE_CONCEPT "Use conecpt instead of enable_if" ON)
 else()
 	option(OPT_USE_CONCEPT "Use conecpt instead of enable_if" OFF)
 endif()

librf/src/type_concept.inl

@@ -12,7 +12,7 @@ namespace resumef
 	template<typename T>
 	concept _AwaitorT = requires(T&& v)
 	{
-		{ v.await_ready() } ->bool;
+		{ v.await_ready() } ->std::same_as<bool>;
 		{ v.await_suspend(std::declval<std::experimental::coroutine_handle<promise_t<>>>()) };
 		{ v.await_resume() };
 		requires traits::is_valid_await_suspend_return_v<
@@ -38,8 +38,8 @@ namespace resumef
 	template<typename T>
 	concept _CallableT = std::invocable<T>;
 
-	template<typename T>
-	concept _GeneratorT = std::is_same_v<T, generator_t<_Ty>>;
+	//template<typename T>
+	//concept _GeneratorT = std::is_same_v<T, generator_t<T>>;
 
 	template<typename T>
 	concept _AwaitableT = requires(T&& v)
@@ -53,15 +53,15 @@ namespace resumef
 	template<typename T>
 	concept _IteratorT = requires(T&& u, T&& v)
 	{
-		{ ++u }->T;
-		{ u != v } ->bool;
+		{ ++u } ->std::common_with<T>;
+		{ u != v } ->std::same_as<bool>;
 		{ *u };
 	};
 
 	template<typename T, typename E>
 	concept _IteratorOfT = _IteratorT<T> && requires(T&& u)
 	{
-		{ *u } ->std::same_as<E&>;
+		{ *u } ->std::common_with<E&>;
 	};
 
 	template<typename T>
@@ -81,7 +81,8 @@ namespace resumef
 	template<typename T, typename E>
 	concept _ContainerOfT = _ContainerT<T> && requires(T&& v)
 	{
-		requires std::is_same_v<E, remove_cvref_t<decltype(*std::begin(v))>>;
+		{ *std::begin(v) } ->std::common_with<E&>;
+		//requires std::is_same_v<E, remove_cvref_t<decltype(*std::begin(v))>>;
 	};
 
 #define COMMA_RESUMEF_ENABLE_IF_TYPENAME() 
@@ -95,7 +96,7 @@ namespace resumef
 #define _HasStateT typename
 #define _FutureT typename
 #define _CallableT typename
-#define _GeneratorT typename
+//#define _GeneratorT typename
 #define _AwaitableT typename
 #define _WhenTaskT typename
 #define _IteratorT typename
@@ -119,7 +120,7 @@ concept _LockAssembleT = requires(T && v)
 	{ v[0] };
 	{ v._Lock_ref(v[0]) };
 	{ v._Try_lock_ref(v[0]) };
-	{ v._Unlock_ref(v[0]) } ->void;
+	{ v._Unlock_ref(v[0]) } ->std::same_as<void>;
 	{ v._Yield() };
 	{ v._ReturnValue() };
 	{ v._ReturnValue(0) };

vs_proj/librf.vcxproj

@@ -40,7 +40,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>ClangCL</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">