From c87d2ed86a2b84f8e75c69a21d34b2d70b4d57c1 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Thu, 16 Dec 2021 14:24:19 -0500 Subject: [PATCH 1/2] Revert "Add back app/src/mutex.h that just redirects to app/src/include/firebase/internal/mutex.h" This reverts commit 23278895a95e863a5c531d664d8c8cf52f59fb6c. --- app/CMakeLists.txt | 1 - app/src/mutex.h | 22 ---------------------- 2 files changed, 23 deletions(-) delete mode 100644 app/src/mutex.h diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 4f11136dac..c8fc0510e6 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -248,7 +248,6 @@ set(utility_common_HDRS src/log.h src/heartbeat_date_storage_desktop.h src/heartbeat_info_desktop.h - src/mutex.h src/optional.h src/path.h src/pthread_condvar.h diff --git a/app/src/mutex.h b/app/src/mutex.h deleted file mode 100644 index c109560bbf..0000000000 --- a/app/src/mutex.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2016 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FIREBASE_APP_SRC_MUTEX_H_ -#define FIREBASE_APP_SRC_MUTEX_H_ - -#include "app/src/include/firebase/internal/mutex.h" - -#endif // FIREBASE_APP_SRC_MUTEX_H_ From 9f5a58e409cc0b3d66efe85329932156d62f6ade Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Thu, 16 Dec 2021 14:24:38 -0500 Subject: [PATCH 2/2] Revert "Revert "Adjust include paths to mutex.h"." This reverts commit 7c5b8708f6e6ffab39b13ce57161e72e49256978. --- admob/src/android/banner_view_internal_android.cc | 2 +- admob/src/android/native_express_ad_view_internal_android.cc | 2 +- admob/src/common/banner_view_internal.cc | 2 +- admob/src/common/banner_view_internal.h | 2 +- admob/src/common/interstitial_ad_internal.cc | 2 +- admob/src/common/interstitial_ad_internal.h | 2 +- admob/src/common/native_express_ad_view_internal.cc | 2 +- admob/src/common/native_express_ad_view_internal.h | 2 +- admob/src/common/rewarded_video.cc | 2 +- admob/src/common/rewarded_video_internal.cc | 2 +- admob/src/common/rewarded_video_internal.h | 2 +- analytics/src/analytics_ios.mm | 2 +- app/rest/controller_curl.cc | 2 +- app/rest/controller_curl.h | 2 +- app/rest/transport_curl.cc | 2 +- app/rest/transport_curl.h | 2 +- app/rest/util.h | 2 +- app/src/app_common.cc | 2 +- app/src/app_ios.mm | 2 +- app/src/callback.cc | 2 +- app/src/cleanup_notifier.h | 2 +- app/src/function_registry.h | 2 +- app/src/future_manager.h | 2 +- app/src/heartbeat_date_storage_desktop.cc | 2 +- app/src/invites/android/invites_android_helper.h | 2 +- app/src/invites/cached_receiver.h | 2 +- app/src/invites/invites_receiver_internal.h | 2 +- app/src/invites/ios/invites_receiver_internal_ios.mm | 2 +- app/src/log.cc | 2 +- app/src/log_stdio.cc | 2 +- app/src/mutex_pthread.cc | 2 +- app/src/mutex_windows.cc | 2 +- app/src/reference_count.h | 2 +- app/src/reference_counted_future_impl.cc | 2 +- app/src/reference_counted_future_impl.h | 2 +- app/src/safe_reference.h | 2 +- app/src/scheduler.h | 2 +- app/src/semaphore.h | 2 +- app/src/thread_pthread.cc | 2 +- app/src/util.cc | 2 +- app/src/util.h | 2 +- app/tests/callback_test.cc | 2 +- app/tests/reference_count_test.cc | 2 +- app/tests/thread_test.cc | 2 +- auth/src/android/auth_android.cc | 2 +- auth/src/auth.cc | 2 +- auth/src/data.h | 2 +- auth/src/desktop/auth_providers/federated_auth_provider.cc | 2 +- auth/src/desktop/rpcs/auth_request.cc | 2 +- auth/src/desktop/user_view.h | 2 +- auth/src/ios/auth_ios.mm | 2 +- auth/tests/desktop/auth_desktop_test.cc | 2 +- auth/tests/desktop/user_desktop_test.cc | 2 +- database/src/android/database_android.h | 2 +- database/src/common/listener.h | 2 +- database/src/desktop/connection/web_socket_client_impl.cc | 2 +- database/src/desktop/connection/web_socket_client_impl.h | 2 +- database/src/desktop/core/repo.cc | 2 +- database/src/desktop/database_desktop.h | 2 +- database/src/desktop/persistence/noop_persistence_manager.h | 2 +- database/src/desktop/persistence/persistence_manager.h | 2 +- database/src/desktop/push_child_name_generator.h | 2 +- database/src/ios/database_ios.h | 2 +- .../src/android/jni_runnable_android_test.cc | 2 +- .../src/android/promise_android_test.cc | 2 +- .../integration_test_internal/src/firestore_integration_test.h | 2 +- firestore/integration_test_internal/src/firestore_test.cc | 2 +- firestore/integration_test_internal/src/transaction_test.cc | 2 +- functions/src/android/functions_android.h | 2 +- functions/src/ios/functions_ios.h | 2 +- installations/src/installations.cc | 2 +- messaging/src/android/cpp/messaging.cc | 2 +- messaging/src/common.cc | 2 +- messaging/src/ios/messaging.mm | 2 +- messaging/src/stub/messaging.cc | 2 +- remote_config/src/android/remote_config_android.h | 2 +- remote_config/src/desktop/remote_config_desktop.h | 2 +- remote_config/src/remote_config.cc | 2 +- storage/src/android/storage_android.h | 2 +- storage/src/desktop/controller_desktop.h | 2 +- storage/src/desktop/curl_requests.h | 2 +- storage/src/desktop/listener_desktop.cc | 2 +- storage/src/desktop/listener_desktop.h | 2 +- storage/src/desktop/rest_operation.cc | 2 +- storage/src/desktop/rest_operation.h | 2 +- storage/src/desktop/storage_desktop.h | 2 +- storage/src/ios/listener_ios.mm | 2 +- storage/src/ios/storage_ios.h | 2 +- testing/config_desktop.cc | 2 +- testlab/src/ios/testlab.mm | 2 +- 90 files changed, 90 insertions(+), 90 deletions(-) diff --git a/admob/src/android/banner_view_internal_android.cc b/admob/src/android/banner_view_internal_android.cc index 0e520f2374..cdf548c4d4 100644 --- a/admob/src/android/banner_view_internal_android.cc +++ b/admob/src/android/banner_view_internal_android.cc @@ -30,7 +30,7 @@ #include "admob/src/include/firebase/admob/banner_view.h" #include "admob/src/include/firebase/admob/types.h" #include "app/src/assert.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/semaphore.h" #include "app/src/util_android.h" diff --git a/admob/src/android/native_express_ad_view_internal_android.cc b/admob/src/android/native_express_ad_view_internal_android.cc index d23b831820..85201eec30 100644 --- a/admob/src/android/native_express_ad_view_internal_android.cc +++ b/admob/src/android/native_express_ad_view_internal_android.cc @@ -30,7 +30,7 @@ #include "admob/src/include/firebase/admob/native_express_ad_view.h" #include "admob/src/include/firebase/admob/types.h" #include "app/src/assert.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/util_android.h" namespace firebase { diff --git a/admob/src/common/banner_view_internal.cc b/admob/src/common/banner_view_internal.cc index e767abf8cc..f82452bb2d 100644 --- a/admob/src/common/banner_view_internal.cc +++ b/admob/src/common/banner_view_internal.cc @@ -18,8 +18,8 @@ #include "admob/src/include/firebase/admob/banner_view.h" #include "app/src/include/firebase/future.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/internal/platform.h" -#include "app/src/mutex.h" #include "app/src/reference_counted_future_impl.h" #if FIREBASE_PLATFORM_ANDROID diff --git a/admob/src/common/banner_view_internal.h b/admob/src/common/banner_view_internal.h index 51f2416244..18ec6d0195 100644 --- a/admob/src/common/banner_view_internal.h +++ b/admob/src/common/banner_view_internal.h @@ -20,7 +20,7 @@ #include "admob/src/common/admob_common.h" #include "admob/src/include/firebase/admob/banner_view.h" #include "app/src/include/firebase/future.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace admob { diff --git a/admob/src/common/interstitial_ad_internal.cc b/admob/src/common/interstitial_ad_internal.cc index 8626c5395f..279087f46b 100644 --- a/admob/src/common/interstitial_ad_internal.cc +++ b/admob/src/common/interstitial_ad_internal.cc @@ -18,8 +18,8 @@ #include "admob/src/include/firebase/admob/interstitial_ad.h" #include "app/src/include/firebase/future.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/internal/platform.h" -#include "app/src/mutex.h" #include "app/src/reference_counted_future_impl.h" #if FIREBASE_PLATFORM_ANDROID diff --git a/admob/src/common/interstitial_ad_internal.h b/admob/src/common/interstitial_ad_internal.h index 9bf3bb9d04..3d4be125aa 100644 --- a/admob/src/common/interstitial_ad_internal.h +++ b/admob/src/common/interstitial_ad_internal.h @@ -20,7 +20,7 @@ #include "admob/src/common/admob_common.h" #include "admob/src/include/firebase/admob/interstitial_ad.h" #include "app/src/include/firebase/future.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace admob { diff --git a/admob/src/common/native_express_ad_view_internal.cc b/admob/src/common/native_express_ad_view_internal.cc index f4464701b2..82b192f2a9 100644 --- a/admob/src/common/native_express_ad_view_internal.cc +++ b/admob/src/common/native_express_ad_view_internal.cc @@ -18,8 +18,8 @@ #include "admob/src/include/firebase/admob/native_express_ad_view.h" #include "app/src/include/firebase/future.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/internal/platform.h" -#include "app/src/mutex.h" #include "app/src/reference_counted_future_impl.h" #if FIREBASE_PLATFORM_ANDROID diff --git a/admob/src/common/native_express_ad_view_internal.h b/admob/src/common/native_express_ad_view_internal.h index 462d8f5d0f..aca2fd3d74 100644 --- a/admob/src/common/native_express_ad_view_internal.h +++ b/admob/src/common/native_express_ad_view_internal.h @@ -20,7 +20,7 @@ #include "admob/src/common/admob_common.h" #include "admob/src/include/firebase/admob/native_express_ad_view.h" #include "app/src/include/firebase/future.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace admob { diff --git a/admob/src/common/rewarded_video.cc b/admob/src/common/rewarded_video.cc index a18662e384..eb8d0fa50b 100644 --- a/admob/src/common/rewarded_video.cc +++ b/admob/src/common/rewarded_video.cc @@ -20,7 +20,7 @@ #include "admob/src/common/rewarded_video_internal.h" #include "app/src/assert.h" #include "app/src/include/firebase/future.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace admob { diff --git a/admob/src/common/rewarded_video_internal.cc b/admob/src/common/rewarded_video_internal.cc index 4c0ee2fb37..73fd17a770 100644 --- a/admob/src/common/rewarded_video_internal.cc +++ b/admob/src/common/rewarded_video_internal.cc @@ -18,8 +18,8 @@ #include "admob/src/include/firebase/admob/rewarded_video.h" #include "app/src/include/firebase/future.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/internal/platform.h" -#include "app/src/mutex.h" #include "app/src/reference_counted_future_impl.h" #if FIREBASE_PLATFORM_ANDROID diff --git a/admob/src/common/rewarded_video_internal.h b/admob/src/common/rewarded_video_internal.h index be8bdac1ab..abbf61a469 100644 --- a/admob/src/common/rewarded_video_internal.h +++ b/admob/src/common/rewarded_video_internal.h @@ -20,7 +20,7 @@ #include "admob/src/common/admob_common.h" #include "admob/src/include/firebase/admob/rewarded_video.h" #include "app/src/include/firebase/future.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace admob { diff --git a/analytics/src/analytics_ios.mm b/analytics/src/analytics_ios.mm index dd36d1987f..5aa97232ee 100644 --- a/analytics/src/analytics_ios.mm +++ b/analytics/src/analytics_ios.mm @@ -22,9 +22,9 @@ #include "analytics/src/analytics_common.h" #include "app/src/assert.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/version.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/thread.h" #include "app/src/time.h" #include "app/src/util.h" diff --git a/app/rest/controller_curl.cc b/app/rest/controller_curl.cc index 41ba0d8f0b..0387dcadb4 100644 --- a/app/rest/controller_curl.cc +++ b/app/rest/controller_curl.cc @@ -20,8 +20,8 @@ #include "app/rest/transport_curl.h" #include "app/src/include/firebase/internal/common.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/log.h" -#include "app/src/mutex.h" namespace firebase { namespace rest { diff --git a/app/rest/controller_curl.h b/app/rest/controller_curl.h index 75c9644a47..c13d8288cb 100644 --- a/app/rest/controller_curl.h +++ b/app/rest/controller_curl.h @@ -22,7 +22,7 @@ #include "app/rest/controller_interface.h" #include "app/rest/response.h" #include "app/src/include/firebase/internal/common.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace rest { diff --git a/app/rest/transport_curl.cc b/app/rest/transport_curl.cc index 730be14da6..46712b0dc2 100644 --- a/app/rest/transport_curl.cc +++ b/app/rest/transport_curl.cc @@ -23,8 +23,8 @@ #include "app/rest/controller_curl.h" #include "app/rest/util.h" #include "app/src/assert.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/internal/platform.h" -#include "app/src/mutex.h" #include "app/src/semaphore.h" #include "app/src/thread.h" #include "app/src/util.h" diff --git a/app/rest/transport_curl.h b/app/rest/transport_curl.h index 19de88f14f..6c9c569755 100644 --- a/app/rest/transport_curl.h +++ b/app/rest/transport_curl.h @@ -22,7 +22,7 @@ #include #include "app/rest/transport_interface.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/semaphore.h" #include "flatbuffers/stl_emulation.h" diff --git a/app/rest/util.h b/app/rest/util.h index e4a8576549..32c543aa59 100644 --- a/app/rest/util.h +++ b/app/rest/util.h @@ -19,8 +19,8 @@ #include +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/variant.h" -#include "app/src/mutex.h" #include "flatbuffers/idl.h" namespace firebase { diff --git a/app/src/app_common.cc b/app/src/app_common.cc index 44fa12328c..e0c1d29669 100644 --- a/app/src/app_common.cc +++ b/app/src/app_common.cc @@ -30,9 +30,9 @@ #include "app/src/cleanup_notifier.h" #include "app/src/include/firebase/app.h" #include "app/src/include/firebase/internal/common.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/internal/platform.h" #include "app/src/include/firebase/version.h" -#include "app/src/mutex.h" #include "app/src/util.h" // strtok_r is strtok_s on Windows. diff --git a/app/src/app_ios.mm b/app/src/app_ios.mm index e2c649482d..7f2145fe21 100644 --- a/app/src/app_ios.mm +++ b/app/src/app_ios.mm @@ -22,9 +22,9 @@ #include "app/src/app_common.h" #include "app/src/app_ios.h" #include "app/src/assert.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/version.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/util.h" #include "app/src/util_ios.h" diff --git a/app/src/callback.cc b/app/src/callback.cc index 4d59430951..50fe8d51be 100644 --- a/app/src/callback.cc +++ b/app/src/callback.cc @@ -19,8 +19,8 @@ #include #include "app/memory/shared_ptr.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/semaphore.h" #include "app/src/thread.h" diff --git a/app/src/cleanup_notifier.h b/app/src/cleanup_notifier.h index 821de1b684..45846c47b1 100644 --- a/app/src/cleanup_notifier.h +++ b/app/src/cleanup_notifier.h @@ -20,7 +20,7 @@ #include #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { diff --git a/app/src/function_registry.h b/app/src/function_registry.h index 647e08c606..8ce27c2978 100644 --- a/app/src/function_registry.h +++ b/app/src/function_registry.h @@ -19,7 +19,7 @@ #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { class App; diff --git a/app/src/future_manager.h b/app/src/future_manager.h index 991594932e..a9844bffb7 100644 --- a/app/src/future_manager.h +++ b/app/src/future_manager.h @@ -21,7 +21,7 @@ #include #include "app/src/include/firebase/future.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/reference_counted_future_impl.h" namespace firebase { diff --git a/app/src/heartbeat_date_storage_desktop.cc b/app/src/heartbeat_date_storage_desktop.cc index 627c89c5aa..0a79e426a9 100644 --- a/app/src/heartbeat_date_storage_desktop.cc +++ b/app/src/heartbeat_date_storage_desktop.cc @@ -20,7 +20,7 @@ #include #include "app/src/filesystem.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { diff --git a/app/src/invites/android/invites_android_helper.h b/app/src/invites/android/invites_android_helper.h index 707b63764b..bfd0efaf05 100644 --- a/app/src/invites/android/invites_android_helper.h +++ b/app/src/invites/android/invites_android_helper.h @@ -22,8 +22,8 @@ #include #include "app/src/include/firebase/app.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/invites/sender_receiver_interface.h" -#include "app/src/mutex.h" #include "app/src/util_android.h" namespace firebase { diff --git a/app/src/invites/cached_receiver.h b/app/src/invites/cached_receiver.h index 2519af1223..a0a8166e5d 100644 --- a/app/src/invites/cached_receiver.h +++ b/app/src/invites/cached_receiver.h @@ -19,8 +19,8 @@ #include +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/invites/receiver_interface.h" -#include "app/src/mutex.h" namespace firebase { namespace invites { diff --git a/app/src/invites/invites_receiver_internal.h b/app/src/invites/invites_receiver_internal.h index e9a3c754ba..b77e81aa7b 100644 --- a/app/src/invites/invites_receiver_internal.h +++ b/app/src/invites/invites_receiver_internal.h @@ -23,10 +23,10 @@ #include "app/src/include/firebase/app.h" #include "app/src/include/firebase/future.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/invites/cached_receiver.h" #include "app/src/invites/receiver_interface.h" #include "app/src/invites/sender_receiver_interface.h" -#include "app/src/mutex.h" #include "app/src/reference_counted_future_impl.h" namespace firebase { diff --git a/app/src/invites/ios/invites_receiver_internal_ios.mm b/app/src/invites/ios/invites_receiver_internal_ios.mm index efff2c4335..33550324f6 100644 --- a/app/src/invites/ios/invites_receiver_internal_ios.mm +++ b/app/src/invites/ios/invites_receiver_internal_ios.mm @@ -23,10 +23,10 @@ #include "app/src/assert.h" #include "app/src/include/firebase/app.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/invites/invites_receiver_internal.h" #include "app/src/invites/ios/invites_ios_startup.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/util_ios.h" #include "FIRDynamicLink.h" diff --git a/app/src/log.cc b/app/src/log.cc index 6bea26bce7..11cc44f84c 100644 --- a/app/src/log.cc +++ b/app/src/log.cc @@ -22,7 +22,7 @@ #include #include "app/src/assert.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #if !defined(FIREBASE_LOG_DEBUG) #define FIREBASE_LOG_DEBUG 0 diff --git a/app/src/log_stdio.cc b/app/src/log_stdio.cc index b7dd8b38d5..7625d9df81 100644 --- a/app/src/log_stdio.cc +++ b/app/src/log_stdio.cc @@ -27,7 +27,7 @@ #include #endif // FIREBASE_PLATFORM_WINDOWS -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { diff --git a/app/src/mutex_pthread.cc b/app/src/mutex_pthread.cc index 4e4850d8a9..1f8496e2de 100644 --- a/app/src/mutex_pthread.cc +++ b/app/src/mutex_pthread.cc @@ -17,7 +17,7 @@ #include #include "app/src/assert.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { diff --git a/app/src/mutex_windows.cc b/app/src/mutex_windows.cc index 7429fbc881..9ecfe7ea3b 100644 --- a/app/src/mutex_windows.cc +++ b/app/src/mutex_windows.cc @@ -16,8 +16,8 @@ #include #include "app/src/assert.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/internal/platform.h" -#include "app/src/mutex.h" namespace firebase { diff --git a/app/src/reference_count.h b/app/src/reference_count.h index adc98ce916..5f495900e1 100644 --- a/app/src/reference_count.h +++ b/app/src/reference_count.h @@ -17,7 +17,7 @@ #ifndef FIREBASE_APP_SRC_REFERENCE_COUNT_H_ #define FIREBASE_APP_SRC_REFERENCE_COUNT_H_ -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace internal { diff --git a/app/src/reference_counted_future_impl.cc b/app/src/reference_counted_future_impl.cc index 57e03da688..f894df2879 100644 --- a/app/src/reference_counted_future_impl.cc +++ b/app/src/reference_counted_future_impl.cc @@ -22,9 +22,9 @@ #include "app/src/assert.h" #include "app/src/include/firebase/future.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/intrusive_list.h" #include "app/src/log.h" -#include "app/src/mutex.h" // Set this to 1 to enable verbose logging in this module. #if !defined(FIREBASE_FUTURE_TRACE_ENABLE) diff --git a/app/src/reference_counted_future_impl.h b/app/src/reference_counted_future_impl.h index 2c4b09673b..5d986d2858 100644 --- a/app/src/reference_counted_future_impl.h +++ b/app/src/reference_counted_future_impl.h @@ -25,7 +25,7 @@ #include "app/src/cleanup_notifier.h" #include "app/src/include/firebase/future.h" #include "app/src/include/firebase/internal/common.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { diff --git a/app/src/safe_reference.h b/app/src/safe_reference.h index 485e90a03a..29c901565a 100644 --- a/app/src/safe_reference.h +++ b/app/src/safe_reference.h @@ -16,7 +16,7 @@ #define FIREBASE_APP_SRC_SAFE_REFERENCE_H_ #include "app/memory/shared_ptr.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace internal { diff --git a/app/src/scheduler.h b/app/src/scheduler.h index 6fd11e984a..306506c669 100644 --- a/app/src/scheduler.h +++ b/app/src/scheduler.h @@ -21,7 +21,7 @@ #include "app/memory/shared_ptr.h" #include "app/src/callback.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/semaphore.h" #include "app/src/thread.h" #include "firebase/internal/common.h" diff --git a/app/src/semaphore.h b/app/src/semaphore.h index 67f37c8c47..23a77305e9 100644 --- a/app/src/semaphore.h +++ b/app/src/semaphore.h @@ -37,7 +37,7 @@ #include #if FIREBASE_PLATFORM_OSX || FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/pthread_condvar.h" #endif // FIREBASE_PLATFORM_OSX || FIREBASE_PLATFORM_IOS || // FIREBASE_PLATFORM_TVOS diff --git a/app/src/thread_pthread.cc b/app/src/thread_pthread.cc index 825dabcea8..a549c1be48 100644 --- a/app/src/thread_pthread.cc +++ b/app/src/thread_pthread.cc @@ -19,7 +19,7 @@ #if defined(_STLPORT_VERSION) #include "app/src/assert.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/pthread_condvar.h" namespace firebase { diff --git a/app/src/util.cc b/app/src/util.cc index b7106a6ede..26ea274a22 100644 --- a/app/src/util.cc +++ b/app/src/util.cc @@ -27,8 +27,8 @@ #if FIREBASE_PLATFORM_ANDROID #include "app/src/include/google_play_services/availability.h" #endif // FIREBASE_PLATFORM_ANDROID +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/reference_counted_future_impl.h" #include "app/src/util.h" diff --git a/app/src/util.h b/app/src/util.h index c1526b6772..a55ff7591f 100644 --- a/app/src/util.h +++ b/app/src/util.h @@ -23,9 +23,9 @@ #include "app/src/include/firebase/app.h" #include "app/src/include/firebase/internal/common.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/internal/platform.h" #include "app/src/include/google_play_services/availability.h" -#include "app/src/mutex.h" #include "app/src/reference_counted_future_impl.h" namespace firebase { diff --git a/app/tests/callback_test.cc b/app/tests/callback_test.cc index 986189de88..d0322866d2 100644 --- a/app/tests/callback_test.cc +++ b/app/tests/callback_test.cc @@ -20,7 +20,7 @@ #include #include "app/memory/unique_ptr.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/thread.h" #include "app/src/time.h" #include "gmock/gmock.h" diff --git a/app/tests/reference_count_test.cc b/app/tests/reference_count_test.cc index 9231542185..1a102a66a4 100644 --- a/app/tests/reference_count_test.cc +++ b/app/tests/reference_count_test.cc @@ -16,7 +16,7 @@ #include "app/src/reference_count.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/app/tests/thread_test.cc b/app/tests/thread_test.cc index b822d67229..6517f4163d 100644 --- a/app/tests/thread_test.cc +++ b/app/tests/thread_test.cc @@ -16,7 +16,7 @@ #include "app/src/thread.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/auth/src/android/auth_android.cc b/auth/src/android/auth_android.cc index b5fa6c2087..35eedf36e5 100644 --- a/auth/src/android/auth_android.cc +++ b/auth/src/android/auth_android.cc @@ -19,8 +19,8 @@ #include "app/src/assert.h" #include "app/src/embedded_file.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/util_android.h" #include "auth/auth_resources.h" #include "auth/src/android/common_android.h" diff --git a/auth/src/auth.cc b/auth/src/auth.cc index 8aa4d51cc1..8e1195d0dc 100644 --- a/auth/src/auth.cc +++ b/auth/src/auth.cc @@ -29,9 +29,9 @@ #include "app/src/include/firebase/app.h" #include "app/src/include/firebase/future.h" #include "app/src/include/firebase/internal/common.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/internal/platform.h" #include "app/src/include/firebase/version.h" -#include "app/src/mutex.h" #include "app/src/semaphore.h" #include "app/src/util.h" #include "auth/src/common.h" diff --git a/auth/src/data.h b/auth/src/data.h index 73480c5bc3..797a680148 100644 --- a/auth/src/data.h +++ b/auth/src/data.h @@ -19,7 +19,7 @@ #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/reference_counted_future_impl.h" #include "auth/src/include/firebase/auth.h" #include "auth/src/include/firebase/auth/user.h" diff --git a/auth/src/desktop/auth_providers/federated_auth_provider.cc b/auth/src/desktop/auth_providers/federated_auth_provider.cc index 70b7f65f73..7d6a30c71d 100644 --- a/auth/src/desktop/auth_providers/federated_auth_provider.cc +++ b/auth/src/desktop/auth_providers/federated_auth_provider.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "app/src/include/firebase/future.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "auth/src/desktop/auth_desktop.h" #include "auth/src/desktop/sign_in_flow.h" #include "auth/src/include/firebase/auth.h" diff --git a/auth/src/desktop/rpcs/auth_request.cc b/auth/src/desktop/rpcs/auth_request.cc index 18dc880481..be54a0d4ce 100644 --- a/auth/src/desktop/rpcs/auth_request.cc +++ b/auth/src/desktop/rpcs/auth_request.cc @@ -18,7 +18,7 @@ #include "app/src/app_common.h" #include "app/src/include/firebase/app.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace auth { diff --git a/auth/src/desktop/user_view.h b/auth/src/desktop/user_view.h index 20f28d685c..43afd35da8 100644 --- a/auth/src/desktop/user_view.h +++ b/auth/src/desktop/user_view.h @@ -19,7 +19,7 @@ #include #include "app/src/assert.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "auth/src/common.h" #include "auth/src/data.h" #include "auth/src/desktop/provider_user_info.h" diff --git a/auth/src/ios/auth_ios.mm b/auth/src/ios/auth_ios.mm index b641245e05..e53e5a6eda 100644 --- a/auth/src/ios/auth_ios.mm +++ b/auth/src/ios/auth_ios.mm @@ -23,8 +23,8 @@ #include "app/src/app_ios.h" #include "app/src/assert.h" #include "app/src/include/firebase/internal/common.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/reference_counted_future_impl.h" #include "app/src/util_ios.h" #include "auth/src/ios/common_ios.h" diff --git a/auth/tests/desktop/auth_desktop_test.cc b/auth/tests/desktop/auth_desktop_test.cc index bf072f16a1..33b088df23 100644 --- a/auth/tests/desktop/auth_desktop_test.cc +++ b/auth/tests/desktop/auth_desktop_test.cc @@ -24,7 +24,7 @@ #include "app/rest/transport_curl.h" #include "app/rest/transport_mock.h" #include "app/src/include/firebase/app.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/tests/include/firebase/app_for_testing.h" #include "auth/src/desktop/sign_in_flow.h" #include "auth/src/desktop/user_desktop.h" diff --git a/auth/tests/desktop/user_desktop_test.cc b/auth/tests/desktop/user_desktop_test.cc index 99c206e45c..bd466efe23 100644 --- a/auth/tests/desktop/user_desktop_test.cc +++ b/auth/tests/desktop/user_desktop_test.cc @@ -18,7 +18,7 @@ #include "app/rest/transport_curl.h" #include "app/rest/transport_mock.h" #include "app/src/include/firebase/app.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/tests/include/firebase/app_for_testing.h" #include "auth/src/desktop/auth_desktop.h" #include "auth/src/include/firebase/auth.h" diff --git a/database/src/android/database_android.h b/database/src/android/database_android.h index 02aa93828b..7747d3b4a2 100644 --- a/database/src/android/database_android.h +++ b/database/src/android/database_android.h @@ -24,9 +24,9 @@ #include "app/src/cleanup_notifier.h" #include "app/src/future_manager.h" #include "app/src/include/firebase/app.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/log.h" #include "app/src/logger.h" -#include "app/src/mutex.h" #include "app/src/util_android.h" #include "database/src/android/database_reference_android.h" #include "database/src/common/listener.h" diff --git a/database/src/common/listener.h b/database/src/common/listener.h index 345f0ebd49..78515ac9a6 100644 --- a/database/src/common/listener.h +++ b/database/src/common/listener.h @@ -18,7 +18,7 @@ #include #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "database/src/common/query_spec.h" namespace firebase { diff --git a/database/src/desktop/connection/web_socket_client_impl.cc b/database/src/desktop/connection/web_socket_client_impl.cc index 313d5de538..18e66b4089 100644 --- a/database/src/desktop/connection/web_socket_client_impl.cc +++ b/database/src/desktop/connection/web_socket_client_impl.cc @@ -19,8 +19,8 @@ #include "app/src/app_common.h" #include "app/src/assert.h" #include "app/src/include/firebase/app.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/thread.h" namespace firebase { diff --git a/database/src/desktop/connection/web_socket_client_impl.h b/database/src/desktop/connection/web_socket_client_impl.h index 253e5ebb43..dd9541e094 100644 --- a/database/src/desktop/connection/web_socket_client_impl.h +++ b/database/src/desktop/connection/web_socket_client_impl.h @@ -20,8 +20,8 @@ #include "app/memory/atomic.h" #include "app/memory/unique_ptr.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/logger.h" -#include "app/src/mutex.h" #include "app/src/safe_reference.h" #include "app/src/scheduler.h" #include "app/src/thread.h" diff --git a/database/src/desktop/core/repo.cc b/database/src/desktop/core/repo.cc index 25d0197ea1..8709254cac 100644 --- a/database/src/desktop/core/repo.cc +++ b/database/src/desktop/core/repo.cc @@ -16,8 +16,8 @@ #include "app/src/callback.h" #include "app/src/filesystem.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/scheduler.h" #include "app/src/variant_util.h" #include "database/src/desktop/connection/persistent_connection.h" diff --git a/database/src/desktop/database_desktop.h b/database/src/desktop/database_desktop.h index c0ec923fe0..a6c8db699e 100644 --- a/database/src/desktop/database_desktop.h +++ b/database/src/desktop/database_desktop.h @@ -23,8 +23,8 @@ #include "app/src/cleanup_notifier.h" #include "app/src/future_manager.h" #include "app/src/include/firebase/app.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/logger.h" -#include "app/src/mutex.h" #include "app/src/safe_reference.h" #include "app/src/scheduler.h" #include "database/src/common/listener.h" diff --git a/database/src/desktop/persistence/noop_persistence_manager.h b/database/src/desktop/persistence/noop_persistence_manager.h index 35abf21370..3371c21a91 100644 --- a/database/src/desktop/persistence/noop_persistence_manager.h +++ b/database/src/desktop/persistence/noop_persistence_manager.h @@ -21,7 +21,7 @@ #include #include "app/memory/unique_ptr.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/path.h" #include "database/src/common/query_spec.h" #include "database/src/desktop/core/cache_policy.h" diff --git a/database/src/desktop/persistence/persistence_manager.h b/database/src/desktop/persistence/persistence_manager.h index bf5a85120c..3b192fc782 100644 --- a/database/src/desktop/persistence/persistence_manager.h +++ b/database/src/desktop/persistence/persistence_manager.h @@ -21,7 +21,7 @@ #include #include "app/memory/unique_ptr.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/path.h" #include "database/src/common/query_spec.h" #include "database/src/desktop/core/cache_policy.h" diff --git a/database/src/desktop/push_child_name_generator.h b/database/src/desktop/push_child_name_generator.h index fa31e9dc9d..840230d889 100644 --- a/database/src/desktop/push_child_name_generator.h +++ b/database/src/desktop/push_child_name_generator.h @@ -18,7 +18,7 @@ #include #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" namespace firebase { namespace database { diff --git a/database/src/ios/database_ios.h b/database/src/ios/database_ios.h index 2cfab0837c..a6ba50f338 100644 --- a/database/src/ios/database_ios.h +++ b/database/src/ios/database_ios.h @@ -22,8 +22,8 @@ #include "app/src/cleanup_notifier.h" #include "app/src/future_manager.h" #include "app/src/include/firebase/app.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/logger.h" -#include "app/src/mutex.h" #include "app/src/util_ios.h" #include "database/src/common/listener.h" #include "database/src/include/firebase/database/database_reference.h" diff --git a/firestore/integration_test_internal/src/android/jni_runnable_android_test.cc b/firestore/integration_test_internal/src/android/jni_runnable_android_test.cc index 85a95220be..582dfda351 100644 --- a/firestore/integration_test_internal/src/android/jni_runnable_android_test.cc +++ b/firestore/integration_test_internal/src/android/jni_runnable_android_test.cc @@ -18,7 +18,7 @@ #include "android/firestore_integration_test_android.h" #include "app/memory/atomic.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "firestore/src/jni/declaration.h" #include "firestore/src/jni/object.h" #include "firestore/src/jni/ownership.h" diff --git a/firestore/integration_test_internal/src/android/promise_android_test.cc b/firestore/integration_test_internal/src/android/promise_android_test.cc index 5236ca124d..96615a729d 100644 --- a/firestore/integration_test_internal/src/android/promise_android_test.cc +++ b/firestore/integration_test_internal/src/android/promise_android_test.cc @@ -23,7 +23,7 @@ #include "android/firestore_integration_test_android.h" #include "android/task_completion_source.h" #include "app/src/assert.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app_framework.h" #include "firebase/firestore/firestore_errors.h" #include "firebase_test_framework.h" diff --git a/firestore/integration_test_internal/src/firestore_integration_test.h b/firestore/integration_test_internal/src/firestore_integration_test.h index d728c0fbfb..f506b0834b 100644 --- a/firestore/integration_test_internal/src/firestore_integration_test.h +++ b/firestore/integration_test_internal/src/firestore_integration_test.h @@ -28,7 +28,7 @@ #include "app/meta/move.h" #include "app/src/assert.h" #include "app/src/include/firebase/internal/common.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app_framework.h" #include "firestore/src/include/firebase/firestore.h" #include "gtest/gtest.h" diff --git a/firestore/integration_test_internal/src/firestore_test.cc b/firestore/integration_test_internal/src/firestore_test.cc index c31db1ad37..c7b199a9a0 100644 --- a/firestore/integration_test_internal/src/firestore_test.cc +++ b/firestore/integration_test_internal/src/firestore_test.cc @@ -30,7 +30,7 @@ #include "firestore/src/jni/task.h" #endif // defined(__ANDROID__) -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "auth/src/include/firebase/auth.h" #include "firestore/src/common/macros.h" #include "firestore_integration_test.h" diff --git a/firestore/integration_test_internal/src/transaction_test.cc b/firestore/integration_test_internal/src/transaction_test.cc index c3b193f16a..a061eb333a 100644 --- a/firestore/integration_test_internal/src/transaction_test.cc +++ b/firestore/integration_test_internal/src/transaction_test.cc @@ -17,7 +17,7 @@ #include #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/semaphore.h" #include "app/src/time.h" diff --git a/functions/src/android/functions_android.h b/functions/src/android/functions_android.h index 3716462270..5bfc7140f8 100644 --- a/functions/src/android/functions_android.h +++ b/functions/src/android/functions_android.h @@ -24,7 +24,7 @@ #include "app/src/future_manager.h" #include "app/src/include/firebase/app.h" #include "app/src/include/firebase/internal/common.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/util_android.h" #include "functions/src/android/functions_android.h" #include "functions/src/include/firebase/functions/callable_reference.h" diff --git a/functions/src/ios/functions_ios.h b/functions/src/ios/functions_ios.h index 1b337376dc..89adfd2a2f 100644 --- a/functions/src/ios/functions_ios.h +++ b/functions/src/ios/functions_ios.h @@ -22,7 +22,7 @@ #include "app/src/cleanup_notifier.h" #include "app/src/future_manager.h" #include "app/src/include/firebase/app.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/util_ios.h" #include "functions/src/include/firebase/functions/callable_reference.h" diff --git a/installations/src/installations.cc b/installations/src/installations.cc index 033f00cc18..20a462c07c 100644 --- a/installations/src/installations.cc +++ b/installations/src/installations.cc @@ -15,7 +15,7 @@ #include "installations/src/include/firebase/installations.h" #include "app/src/cleanup_notifier.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "installations/src/installations_internal.h" namespace firebase { diff --git a/messaging/src/android/cpp/messaging.cc b/messaging/src/android/cpp/messaging.cc index 047c4e8591..c0ad63040f 100644 --- a/messaging/src/android/cpp/messaging.cc +++ b/messaging/src/android/cpp/messaging.cc @@ -31,9 +31,9 @@ #include "app/src/assert.h" #include "app/src/include/firebase/app.h" #include "app/src/include/firebase/future.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/version.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/reference_counted_future_impl.h" #include "app/src/util.h" #include "app/src/util_android.h" diff --git a/messaging/src/common.cc b/messaging/src/common.cc index c29b257bd0..1229e690b0 100644 --- a/messaging/src/common.cc +++ b/messaging/src/common.cc @@ -20,7 +20,7 @@ #include "app/src/cleanup_notifier.h" #include "app/src/include/firebase/internal/common.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/util.h" #include "messaging/src/include/firebase/messaging.h" diff --git a/messaging/src/ios/messaging.mm b/messaging/src/ios/messaging.mm index fcf9f7cffe..9230c7927f 100644 --- a/messaging/src/ios/messaging.mm +++ b/messaging/src/ios/messaging.mm @@ -27,9 +27,9 @@ #include "app/src/assert.h" #include "app/src/include/firebase/app.h" #include "app/src/include/firebase/internal/common.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/include/firebase/version.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/util_ios.h" #include "messaging/src/common.h" diff --git a/messaging/src/stub/messaging.cc b/messaging/src/stub/messaging.cc index 83ae57b1c6..f4f876ecda 100644 --- a/messaging/src/stub/messaging.cc +++ b/messaging/src/stub/messaging.cc @@ -33,7 +33,7 @@ #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #endif // FIREBASE_MESSAGING_TEST_ENABLED namespace firebase { diff --git a/remote_config/src/android/remote_config_android.h b/remote_config/src/android/remote_config_android.h index f10b3164f4..8dfaad073d 100644 --- a/remote_config/src/android/remote_config_android.h +++ b/remote_config/src/android/remote_config_android.h @@ -17,7 +17,7 @@ #include "app/meta/move.h" #include "app/src/include/firebase/internal/common.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/reference_count.h" #include "app/src/reference_counted_future_impl.h" #include "app/src/util_android.h" diff --git a/remote_config/src/desktop/remote_config_desktop.h b/remote_config/src/desktop/remote_config_desktop.h index aa8f41ff88..32b80c1ba6 100644 --- a/remote_config/src/desktop/remote_config_desktop.h +++ b/remote_config/src/desktop/remote_config_desktop.h @@ -19,7 +19,7 @@ #include #include // NOLINT -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/reference_counted_future_impl.h" #include "app/src/safe_reference.h" #include "app/src/scheduler.h" diff --git a/remote_config/src/remote_config.cc b/remote_config/src/remote_config.cc index 849bb37f95..360e796211 100644 --- a/remote_config/src/remote_config.cc +++ b/remote_config/src/remote_config.cc @@ -17,7 +17,7 @@ #include #include "app/src/cleanup_notifier.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/semaphore.h" #include "include/firebase/remote_config.h" #include "remote_config/src/common.h" diff --git a/storage/src/android/storage_android.h b/storage/src/android/storage_android.h index 77fefac94f..94fe7d5c7d 100644 --- a/storage/src/android/storage_android.h +++ b/storage/src/android/storage_android.h @@ -24,7 +24,7 @@ #include "app/src/future_manager.h" #include "app/src/include/firebase/app.h" #include "app/src/include/firebase/internal/common.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/util_android.h" #include "storage/src/android/storage_android.h" #include "storage/src/include/firebase/storage/common.h" diff --git a/storage/src/desktop/controller_desktop.h b/storage/src/desktop/controller_desktop.h index 453d0bd101..a7a05e9632 100644 --- a/storage/src/desktop/controller_desktop.h +++ b/storage/src/desktop/controller_desktop.h @@ -22,7 +22,7 @@ #include "app/rest/request_binary.h" #include "app/rest/response_binary.h" #include "app/rest/transport_builder.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "storage/src/desktop/rest_operation.h" #include "storage/src/include/firebase/storage/storage_reference.h" diff --git a/storage/src/desktop/curl_requests.h b/storage/src/desktop/curl_requests.h index ce899645b0..e4acee9f05 100644 --- a/storage/src/desktop/curl_requests.h +++ b/storage/src/desktop/curl_requests.h @@ -22,7 +22,7 @@ #include "app/rest/response_binary.h" #include "app/rest/transport_builder.h" #include "app/rest/util.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/reference_counted_future_impl.h" #include "app/src/semaphore.h" #include "storage/src/desktop/listener_desktop.h" diff --git a/storage/src/desktop/listener_desktop.cc b/storage/src/desktop/listener_desktop.cc index 4346ad75a4..30dfd0ccfe 100644 --- a/storage/src/desktop/listener_desktop.cc +++ b/storage/src/desktop/listener_desktop.cc @@ -16,7 +16,7 @@ #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "storage/src/desktop/rest_operation.h" #include "storage/src/include/firebase/storage/listener.h" diff --git a/storage/src/desktop/listener_desktop.h b/storage/src/desktop/listener_desktop.h index 5696b84ce5..202c140beb 100644 --- a/storage/src/desktop/listener_desktop.h +++ b/storage/src/desktop/listener_desktop.h @@ -17,7 +17,7 @@ #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "storage/src/desktop/rest_operation.h" #include "storage/src/include/firebase/storage/controller.h" #include "storage/src/include/firebase/storage/listener.h" diff --git a/storage/src/desktop/rest_operation.cc b/storage/src/desktop/rest_operation.cc index 7dd7353bec..ada6b72da3 100644 --- a/storage/src/desktop/rest_operation.cc +++ b/storage/src/desktop/rest_operation.cc @@ -17,7 +17,7 @@ #include #include "app/rest/transport_curl.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "storage/src/desktop/controller_desktop.h" #include "storage/src/desktop/curl_requests.h" #include "storage/src/desktop/storage_desktop.h" diff --git a/storage/src/desktop/rest_operation.h b/storage/src/desktop/rest_operation.h index a1808283f7..2d9230ab4b 100644 --- a/storage/src/desktop/rest_operation.h +++ b/storage/src/desktop/rest_operation.h @@ -22,7 +22,7 @@ #include "app/rest/request.h" #include "app/rest/transport_curl.h" #include "app/src/cleanup_notifier.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "storage/src/desktop/controller_desktop.h" #include "storage/src/desktop/curl_requests.h" #include "storage/src/desktop/storage_desktop.h" diff --git a/storage/src/desktop/storage_desktop.h b/storage/src/desktop/storage_desktop.h index ecdc013d4e..d20f544952 100644 --- a/storage/src/desktop/storage_desktop.h +++ b/storage/src/desktop/storage_desktop.h @@ -19,7 +19,7 @@ #include #include "app/src/future_manager.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "storage/src/desktop/storage_path.h" #include "storage/src/desktop/storage_reference_desktop.h" #include "storage/src/include/firebase/storage/common.h" diff --git a/storage/src/ios/listener_ios.mm b/storage/src/ios/listener_ios.mm index 916e68a0fa..8a09b9cc9c 100644 --- a/storage/src/ios/listener_ios.mm +++ b/storage/src/ios/listener_ios.mm @@ -14,7 +14,7 @@ #include "storage/src/ios/listener_ios.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "storage/src/include/firebase/storage/controller.h" #include "storage/src/ios/controller_ios.h" #include "storage/src/ios/storage_ios.h" diff --git a/storage/src/ios/storage_ios.h b/storage/src/ios/storage_ios.h index 3144b0cd42..128909da7d 100644 --- a/storage/src/ios/storage_ios.h +++ b/storage/src/ios/storage_ios.h @@ -24,7 +24,7 @@ #include "app/src/cleanup_notifier.h" #include "app/src/future_manager.h" #include "app/src/include/firebase/app.h" -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/util_ios.h" #include "storage/src/include/firebase/storage/storage_reference.h" diff --git a/testing/config_desktop.cc b/testing/config_desktop.cc index 51c1c759b1..abc819d1d3 100644 --- a/testing/config_desktop.cc +++ b/testing/config_desktop.cc @@ -18,7 +18,7 @@ #include #include -#include "app/src/mutex.h" +#include "app/src/include/firebase/internal/mutex.h" #include "flatbuffers/idl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/testlab/src/ios/testlab.mm b/testlab/src/ios/testlab.mm index 59493dcef3..9d6f92bd8f 100644 --- a/testlab/src/ios/testlab.mm +++ b/testlab/src/ios/testlab.mm @@ -18,8 +18,8 @@ #import #include "app/src/include/firebase/app.h" +#include "app/src/include/firebase/internal/mutex.h" #include "app/src/log.h" -#include "app/src/mutex.h" #include "app/src/reference_count.h" #include "app/src/util_ios.h" #include "testlab/src/common/common.h"