Merge pull request #168 from jb-gcx/gcx/fixup-future

Fix compiler warnings in Future implementation
Snapchat · May 17, 2024 · 47e3ddd · 47e3ddd
2 parents ecffe7e + 3f40e5a
commit 47e3ddd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/support-lib/cpp/Future.hpp b/support-lib/cpp/Future.hpp
@@ -23,6 +23,7 @@
 #include <condition_variable>
 #include <mutex>
 #include <cassert>
+#include <exception>
 
 #ifdef __cpp_coroutines
 #if __has_include(<coroutine>)
@@ -414,7 +415,7 @@ Future<void> combine(U&& futures, size_t c) {
         return future;
     }
     for (auto& f: futures) {
-        f.then([context] (auto f) {
+        f.then([context] (auto) {
             if (--(context->counter) == 0) {
                 context->promise.setValue();
             }

diff --git a/support-lib/objc/Future_objc.hpp b/support-lib/objc/Future_objc.hpp
@@ -82,7 +82,7 @@ class FutureAdaptor<Void>
 
         __block auto p = std::make_unique<NativePromiseType>();
         auto f = p->getFuture();
-        [o then: ^id(DJFuture* res) {
+        [o then: ^id(DJFuture*) {
                 @try {
                     p->setValue();
                 } @catch (NSException* e) {
@@ -98,7 +98,7 @@ class FutureAdaptor<Void>
         DJPromise<NSNull*>* promise = [[DJPromise alloc] init];
         DJFuture<NSNull*>* future = [promise getFuture];
 
-        c.then([promise] (Future<void> res) {
+        c.then([promise] (Future<void>) {
                 try {
                     [promise setValue:[NSNull null]];
                 } catch (const std::exception& e) {