diff options
| author |  Konstantin Varlamov <var-const@users.noreply.github.com> | 2018-05-08 19:37:20 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-08 19:37:20 -0400 |
| commit | dbcd179788a4cce4e9e3ae545e736148438c5c6f (patch) | |
| tree | 1870fa7f448dfeff0ed6d696cd1feb4a60b5e45d /Firestore/core/test | |
| parent | 8409f21830f1282a39c4b7888972011f43d2644a (diff) | |
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.
Diffstat (limited to 'Firestore/core/test')
| -rw-r--r-- | Firestore/core/test/firebase/firestore/util/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm (renamed from Firestore/core/test/firebase/firestore/util/async_queue_test_libdispatch.cc) | 3 | ||||
| -rw-r--r-- | Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc (renamed from Firestore/core/test/firebase/firestore/util/async_queue_test_std.cc) | 0 | ||||
| -rw-r--r-- | Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm (renamed from Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.cc) | 0 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt index 2e1e2f9..ea80ea2 100644 --- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt +++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt @@ -80,7 +80,7 @@ if(HAVE_LIBDISPATCH) SOURCES executor_test.h executor_test.cc - executor_libdispatch_test.cc + executor_libdispatch_test.mm async_tests_util.h DEPENDS firebase_firestore_util_executor_libdispatch @@ -94,7 +94,7 @@ cc_test( SOURCES async_queue_test.h async_queue_test.cc - async_queue_test_std.cc + async_queue_std_test.cc async_tests_util.h DEPENDS firebase_firestore_util_executor_std @@ -107,7 +107,7 @@ if(HAVE_LIBDISPATCH) SOURCES async_queue_test.h async_queue_test.cc - async_queue_test_libdispatch.cc + async_queue_libdispatch_test.mm async_tests_util.h DEPENDS firebase_firestore_util_executor_libdispatch diff --git a/Firestore/core/test/firebase/firestore/util/async_queue_test_libdispatch.cc b/Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm index b4b9c63..5452266 100644 --- a/Firestore/core/test/firebase/firestore/util/async_queue_test_libdispatch.cc +++ b/Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm @@ -16,8 +16,9 @@ #include "Firestore/core/test/firebase/firestore/util/async_queue_test.h" -#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h" +#include <memory> +#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h" #include "absl/memory/memory.h" #include "gtest/gtest.h" diff --git a/Firestore/core/test/firebase/firestore/util/async_queue_test_std.cc b/Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc index 9e69ad0..9e69ad0 100644 --- a/Firestore/core/test/firebase/firestore/util/async_queue_test_std.cc +++ b/Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc diff --git a/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.cc b/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm index 0167c83..0167c83 100644 --- a/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.cc +++ b/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm |