Merge pull request #1053 from libcpr/feature/ci_ubuntu24_04

Removed Ubuntu 18.04 and added 24.04 CI runs
libcpr · Jul 10, 2024 · 21d3ad5 · 21d3ad5
2 parents 538da45 + 3a40b43
commit 21d3ad5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
   ubuntu-clang-openssl:
     strategy:
       matrix:
-        container: ["ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04",  "ubuntu:23.04"]
+        container: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:23.04", "ubuntu:24.04"]
         systemCurl: [ON, OFF]
         buildType: [Debug, Release]
     runs-on: ubuntu-latest
@@ -49,7 +49,7 @@ jobs:
   ubuntu-gcc-openssl:
     strategy:
       matrix:
-        container: ["ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04",  "ubuntu:23.04"]
+        container: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:23.04", "ubuntu:24.04"]
         systemCurl: [ON, OFF]
         buildType: [Debug, Release]
     runs-on: ubuntu-latest

diff --git a/include/cpr/threadpool.h b/include/cpr/threadpool.h
@@ -82,7 +82,7 @@ class ThreadPool {
             CreateThread();
         }
         using RetType = decltype(fn(args...));
-        auto task = std::make_shared<std::packaged_task<RetType()> >(std::bind(std::forward<Fn>(fn), std::forward<Args>(args)...));
+        auto task = std::make_shared<std::packaged_task<RetType()>>([fn = std::forward<Fn>(fn), args...]() mutable { return std::invoke(fn, args...); });
         std::future<RetType> future = task->get_future();
         {
             std::lock_guard<std::mutex> locker(task_mutex);