Merge remote-tracking branch 'origin/master' into add_cmake_support

Author: andreasbuhr

README.md

@@ -1,6 +1,6 @@
 # CppCoro - A coroutine library for C++
 
-The 'cppcoro' library provides a set of general-purpose primitives for making use of the coroutines TS proposal described in [N4680](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/n4680.pdf).
+The 'cppcoro' library provides a large set of general-purpose primitives for making use of the coroutines TS proposal described in [N4680](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/n4680.pdf).
 
 These include:
 * Coroutine Types
@@ -168,7 +168,7 @@ namespace cppcoro
 }
 ```
 
-You create a `task<T>` object by calling a coroutine function that returns
+You can create a `task<T>` object by calling a coroutine function that returns
 a `task<T>`.
 
 The coroutine must contain a usage of either `co_await` or `co_return`.

include/cppcoro/cancellation_registration.hpp

@@ -11,6 +11,7 @@
 #include <utility>
 #include <type_traits>
 #include <atomic>
+#include <cstdint>
 
 namespace cppcoro
 {

include/cppcoro/detail/sync_wait_task.hpp

@@ -12,6 +12,7 @@
 #include <experimental/coroutine>
 #include <cassert>
 #include <exception>
+#include <utility>
 
 namespace cppcoro
 {

include/cppcoro/fmap.hpp

@@ -20,6 +20,8 @@ namespace cppcoro
 		class fmap_awaiter
 		{
 			using awaiter_t = typename awaitable_traits<AWAITABLE&&>::awaiter_t;
+            FUNC&& m_func;
+            awaiter_t m_awaiter;
 
 		public:
 
@@ -64,12 +66,6 @@ namespace cppcoro
 					static_cast<FUNC&&>(m_func),
 					static_cast<awaiter_t&&>(m_awaiter).await_resume());
 			}
-
-		private:
-
-			FUNC&& m_func;
-			awaiter_t m_awaiter;
-
 		};
 
 		template<typename FUNC, typename AWAITABLE>

include/cppcoro/generator.hpp

@@ -32,8 +32,8 @@ namespace cppcoro
 
 			generator<T> get_return_object() noexcept;
 
-			constexpr std::experimental::suspend_always initial_suspend() const { return {}; }
-			constexpr std::experimental::suspend_always final_suspend() const { return {}; }
+			constexpr std::experimental::suspend_always initial_suspend() const noexcept { return {}; }
+			constexpr std::experimental::suspend_always final_suspend() const noexcept { return {}; }
 
 			template<
 				typename U = T,

include/cppcoro/resume_on.hpp

@@ -117,8 +117,9 @@ namespace cppcoro
 	template<typename SCHEDULER, typename T>
 	async_generator<T> resume_on(SCHEDULER& scheduler, async_generator<T> source)
 	{
-		for co_await(auto& value : source)
+		for (auto iter = co_await source.begin(); iter != source.end(); co_await ++iter)
 		{
+			auto& value = *iter;
 			co_await scheduler.schedule();
 			co_yield value;
 		}

test/async_generator_tests.cpp

@@ -271,8 +271,9 @@ TEST_CASE("large number of synchronous completions doesn't result in stack-overf
 	auto consumer = [](cppcoro::async_generator<std::uint32_t> sequence) -> cppcoro::task<>
 	{
 		std::uint32_t expected = 0;
-		for co_await(std::uint32_t i : sequence)
+		for (auto iter = co_await sequence.begin(); iter != sequence.end(); co_await ++iter)
 		{
+			std::uint32_t i = *iter;
 			CHECK(i == expected++);
 		}
 

test/doctest/doctest.h

@@ -4404,7 +4404,7 @@ namespace doctest
 		void addToContexts(IContextScope* ptr) { contextState->contexts.push_back(ptr); }
 		void                              popFromContexts() { contextState->contexts.pop_back(); }
 		void useContextIfExceptionOccurred(IContextScope* ptr) {
-			if (std::uncaught_exception()) {
+			if (std::uncaught_exceptions()) {
 				std::ostringstream stream;
 				ptr->build(&stream);
 				contextState->exceptionalContexts.push_back(stream.str());

test/file_tests.cpp

@@ -16,6 +16,7 @@
 #include <random>
 #include <thread>
 #include <cassert>
+#include <string>
 
 #include "io_service_fixture.hpp"
 

test/scheduling_operator_tests.cpp

@@ -87,8 +87,9 @@ TEST_CASE_FIXTURE(io_service_fixture, "schedule_on async_generator<> function")
 		auto seq = schedule_on(io_service(), makeSequence());
 
 		int expected = 1;
-		for co_await(int value : seq)
+		for (auto iter = co_await seq.begin(); iter != seq.end(); co_await ++iter)
 		{
+			int value = *iter;
 			CHECK(value == expected++);
 
 			// Transfer exection back to main thread before
@@ -177,8 +178,9 @@ TEST_CASE_FIXTURE(io_service_fixture, "resume_on async_generator<> function"
 		auto seq = resume_on(otherIoService, makeSequence());
 
 		int expected = 1;
-		for co_await(int value : seq)
+		for (auto iter = co_await seq.begin(); iter != seq.end(); co_await ++iter)
 		{
+			int value = *iter;
 			// Every time we receive a value it should be on our requested
 			// scheduler (ie. main thread)
 			CHECK(std::this_thread::get_id() == mainThreadId);