From dbcd179788a4cce4e9e3ae545e736148438c5c6f Mon Sep 17 00:00:00 2001 From: Konstantin Varlamov Date: Tue, 8 May 2018 19:37:20 -0400 Subject: Firestore C++: compile ExecutorLibdispatch in Objective-C++ mode (#1237) dispatch_queue_t is defined differently in libdispatch depending on whether the library header is being include from Objective-C (or Objective-C++) code, or else from C or C++ code. Make sure that all source files in Firestore that include executor_libdispatch.h are compiled in the same mode (Objective-C++) to avoid linker errors. --- Firestore/core/src/firebase/firestore/util/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Firestore/core/src/firebase/firestore/util/CMakeLists.txt') diff --git a/Firestore/core/src/firebase/firestore/util/CMakeLists.txt b/Firestore/core/src/firebase/firestore/util/CMakeLists.txt index 29d91c7..b2b015b 100644 --- a/Firestore/core/src/firebase/firestore/util/CMakeLists.txt +++ b/Firestore/core/src/firebase/firestore/util/CMakeLists.txt @@ -130,7 +130,7 @@ if(HAVE_LIBDISPATCH) cc_library( firebase_firestore_util_executor_libdispatch SOURCES - executor_libdispatch.cc + executor_libdispatch.mm executor_libdispatch.h executor.h DEPENDS -- cgit v1.2.3