event_v2测试失败

librf/src/event_v2.h

@@ -34,7 +34,11 @@ RESUMEF_NS
 			timeout_awaiter wait_until(const std::chrono::time_point<_Clock, _Duration>& tp) const noexcept;
 
 
-
+			//以下wait_any/wait_all实现，借助when_any/when_all实现。
+			//其接口尽管兼容了v1版本的event_t，但是，其内部细节并没有兼容
+			//v1版本的event_t的wait_any，确保只触发了其中之一，或者超时
+			//而when_any会导致所有的event_t都被触发
+			//改日有空再补上
 
 
 			template<_IteratorT _Iter

librf/src/when_v2.h

@@ -173,7 +173,7 @@ RESUMEF_NS
 		template<class _Val, _WhenIterT _Iter>
 		inline void when_all_range__(scheduler_t& sch, state_when_t* state, std::vector<_Val> & values, _Iter begin, _Iter end)
 		{
-			using _Awaitable = decltype(*begin);
+			using _Awaitable = std::remove_reference_t<decltype(*begin)>;
 
 			intptr_t _Idx = 0;
 			for (; begin != end; ++begin, ++_Idx)
@@ -189,7 +189,7 @@ RESUMEF_NS
 		{
 			assert(idx >= 0);
 
-			decltype(auto) awaitor = when_real_awaitor(task);
+			auto awaitor = when_real_awaitor(task);
 
 			using value_type = awaitor_result_t<decltype(awaitor)>;
 
@@ -232,10 +232,12 @@ RESUMEF_NS
 		template<_WhenIterT _Iter>
 		inline void when_any_range__(scheduler_t& sch, state_when_t* state, when_any_pair_ptr value, _Iter begin, _Iter end)
 		{
+			using _Awaitable = std::remove_reference_t<decltype(*begin)>;
+
 			intptr_t _Idx = 0;
 			for (; begin != end; ++begin, ++_Idx)
 			{
-				sch + when_any_connector(state, std::move(*begin), value, static_cast<intptr_t>(_Idx));
+				sch + when_any_connector<_Awaitable>(state, *begin, value, static_cast<intptr_t>(_Idx));
 			}
 		}
 	}

vs_proj/librf.cpp

@@ -44,9 +44,11 @@ int main(int argc, const char* argv[])
 	//test_ring_queue<resumef::ring_queue_lockfree<int, uint64_t>>();
 
 	//resumable_main_switch_scheduler();
-	resumable_main_when_all();
-	//resumable_main_event_v2();
-	//return 0;
+	resumable_main_event();
+	resumable_main_event_v2();
+	resumable_main_event_timeout();
+	resumable_main_sleep();
+	return 0;
 
 	//if (argc > 1)
 	//	resumable_main_benchmark_asio_client(atoi(argv[1]));