Merge branch 'dm/windows' into 'master'

dm/windows See merge request Tanker/tconcurrent!3
TankerHQ · Mar 1, 2019 · 1e1905c · 1e1905c
2 parents 2e63b67 + fd3d7a1
commit 1e1905c
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 13 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+image: tanker.local:5000/ci-cpp:latest
+
 before_script:
   - dmenv install
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,30 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 
 set(tconcurrent_SRC
+  include/tconcurrent/async.hpp
+  include/tconcurrent/async_wait.hpp
+  include/tconcurrent/barrier.hpp
+  include/tconcurrent/cancelation_token.hpp
+  include/tconcurrent/concurrent_queue.hpp
+  include/tconcurrent/coroutine.hpp
+  include/tconcurrent/detail/boost_fwd.hpp
+  include/tconcurrent/detail/export.hpp
+  include/tconcurrent/detail/shared_base.hpp
+  include/tconcurrent/detail/util.hpp
+  include/tconcurrent/executor.hpp
+  include/tconcurrent/future.hpp
+  include/tconcurrent/future_group.hpp
+  include/tconcurrent/job.hpp
+  include/tconcurrent/packaged_task.hpp
+  include/tconcurrent/periodic_task.hpp
+  include/tconcurrent/promise.hpp
+  include/tconcurrent/semaphore.hpp
+  include/tconcurrent/stackful_coroutine.hpp
+  include/tconcurrent/stackless_coroutine.hpp
+  include/tconcurrent/stepper.hpp
+  include/tconcurrent/task_auto_canceler.hpp
+  include/tconcurrent/thread_pool.hpp
+  include/tconcurrent/when.hpp
   src/barrier.cpp
   src/periodic_task.cpp
   src/stepper.cpp
@@ -30,19 +54,14 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     src/executor_emscripten.cpp
   )
 else()
-  find_package(Boost 1.61 REQUIRED COMPONENTS system thread context)
-
   list(APPEND tconcurrent_SRC
     src/async_wait.cpp
     src/executor.cpp
     src/stackful_coroutine.cpp
     src/thread_pool.cpp
   )
   list(APPEND tconcurrent_LIBS
-    # Keep components, to avoid linking with everything
-    Boost::system
-    Boost::thread
-    Boost::context
+    CONAN_PKG::Boost
     CONAN_PKG::enum-flags
   )
 endif()

diff --git a/conanfile.txt b/conanfile.txt
@@ -2,7 +2,7 @@
 doctest/2.0.1@tanker/testing
 
 [requires]
-Boost/1.66.0@tanker/testing
+Boost/1.68.0@tanker/testing
 enum-flags/0.1a@tanker/testing
 
 [generators]

diff --git a/include/tconcurrent/stackful_coroutine.hpp b/include/tconcurrent/stackful_coroutine.hpp
@@ -21,6 +21,15 @@
 #include <sanitizer/common_interface_defs.h>
 #endif
 
+#if __cplusplus >= 201703L
+#define TCONCURRENT_NODISCARD [[nodiscard]]
+#elif defined(__GNUG__)
+#define TCONCURRENT_NODISCARD __attribute__((warn_unused_result))
+#else
+#define TCONCURRENT_NODISCARD
+#endif
+
+
 namespace tconcurrent
 {
 template <typename E, typename F>
@@ -297,7 +306,7 @@ struct cotask_value
 };
 
 template <typename T>
-class [[nodiscard]] cotask_impl {
+class TCONCURRENT_NODISCARD cotask_impl {
 public:
   using value_type = T;
 
@@ -321,7 +330,7 @@ class [[nodiscard]] cotask_impl {
 };
 
 template <>
-class [[nodiscard]] cotask_impl<void> {
+class TCONCURRENT_NODISCARD cotask_impl<void> {
 public:
   using value_type = void;
 

diff --git a/test/test_future.cpp b/test/test_future.cpp
@@ -61,20 +61,20 @@ TEST_CASE("future<void> should work")
 
 TEST_CASE("exceptional future")
 {
-  auto future = make_exceptional_future<int>("FAIL");
+  auto future = make_exceptional_future<int>(std::invalid_argument{"kaboom"});
   CHECK(future.is_ready());
   CHECK(!future.has_value());
   CHECK(future.has_exception());
-  CHECK_THROWS_AS(future.get(), char*);
+  CHECK_THROWS_AS(future.get(), std::invalid_argument);
 }
 
 TEST_CASE("exceptional future<void>")
 {
-  auto future = make_exceptional_future<void>("FAIL");
+  auto future = make_exceptional_future<void>(std::invalid_argument{"kaboom"});
   CHECK(future.is_ready());
   CHECK(!future.has_value());
   CHECK(future.has_exception());
-  CHECK_THROWS_AS(future.get(), char*);
+  CHECK_THROWS_AS(future.get(), std::invalid_argument);
 }
 
 TEST_CASE("future.wait_for should timeout properly [waiting]")