Skip to content

Commit fdf6ffe

Browse files
dconeybedconeybe
authored
Delete app/src/mutex.h and adjust includes to app/src/include/firebase/internal/mutex.h (#795)
1 parent 89ecf20 commit fdf6ffe

File tree

92 files changed

+90
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+90
-113
lines changed

‎admob/src/android/banner_view_internal_android.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "admob/src/include/firebase/admob/banner_view.h"
3131
#include "admob/src/include/firebase/admob/types.h"
3232
#include "app/src/assert.h"
33-
#include "app/src/mutex.h"
33+
#include "app/src/include/firebase/internal/mutex.h"
3434
#include "app/src/semaphore.h"
3535
#include "app/src/util_android.h"
3636

‎admob/src/android/native_express_ad_view_internal_android.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
3131
#include "admob/src/include/firebase/admob/types.h"
3232
#include "app/src/assert.h"
33-
#include "app/src/mutex.h"
33+
#include "app/src/include/firebase/internal/mutex.h"
3434
#include "app/src/util_android.h"
3535

3636
namespace firebase {

‎admob/src/common/banner_view_internal.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/banner_view.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

‎admob/src/common/banner_view_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/banner_view.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎admob/src/common/interstitial_ad_internal.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/interstitial_ad.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

‎admob/src/common/interstitial_ad_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/interstitial_ad.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎admob/src/common/native_express_ad_view_internal.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

‎admob/src/common/native_express_ad_view_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎admob/src/common/rewarded_video.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/rewarded_video_internal.h"
2121
#include "app/src/assert.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎admob/src/common/rewarded_video_internal.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/rewarded_video.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

‎admob/src/common/rewarded_video_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/rewarded_video.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

‎analytics/src/analytics_ios.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
#include "analytics/src/analytics_common.h"
2424
#include "app/src/assert.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2526
#include "app/src/include/firebase/version.h"
2627
#include "app/src/log.h"
27-
#include "app/src/mutex.h"
2828
#include "app/src/thread.h"
2929
#include "app/src/time.h"
3030
#include "app/src/util.h"

‎app/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ set(utility_common_HDRS
248248
src/log.h
249249
src/heartbeat_date_storage_desktop.h
250250
src/heartbeat_info_desktop.h
251-
src/mutex.h
252251
src/optional.h
253252
src/path.h
254253
src/pthread_condvar.h

‎app/rest/controller_curl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
#include "app/rest/transport_curl.h"
2222
#include "app/src/include/firebase/internal/common.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2324
#include "app/src/log.h"
24-
#include "app/src/mutex.h"
2525

2626
namespace firebase {
2727
namespace rest {

‎app/rest/controller_curl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "app/rest/controller_interface.h"
2323
#include "app/rest/response.h"
2424
#include "app/src/include/firebase/internal/common.h"
25-
#include "app/src/mutex.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2626

2727
namespace firebase {
2828
namespace rest {

‎app/rest/transport_curl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "app/rest/controller_curl.h"
2424
#include "app/rest/util.h"
2525
#include "app/src/assert.h"
26+
#include "app/src/include/firebase/internal/mutex.h"
2627
#include "app/src/include/firebase/internal/platform.h"
27-
#include "app/src/mutex.h"
2828
#include "app/src/semaphore.h"
2929
#include "app/src/thread.h"
3030
#include "app/src/util.h"

‎app/rest/transport_curl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <vector>
2323

2424
#include "app/rest/transport_interface.h"
25-
#include "app/src/mutex.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2626
#include "app/src/semaphore.h"
2727
#include "flatbuffers/stl_emulation.h"
2828

‎app/rest/util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include <string>
2121

22+
#include "app/src/include/firebase/internal/mutex.h"
2223
#include "app/src/include/firebase/variant.h"
23-
#include "app/src/mutex.h"
2424
#include "flatbuffers/idl.h"
2525

2626
namespace firebase {

‎app/src/app_common.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include "app/src/cleanup_notifier.h"
3131
#include "app/src/include/firebase/app.h"
3232
#include "app/src/include/firebase/internal/common.h"
33+
#include "app/src/include/firebase/internal/mutex.h"
3334
#include "app/src/include/firebase/internal/platform.h"
3435
#include "app/src/include/firebase/version.h"
35-
#include "app/src/mutex.h"
3636
#include "app/src/util.h"
3737

3838
// strtok_r is strtok_s on Windows.

‎app/src/app_ios.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include "app/src/app_common.h"
2323
#include "app/src/app_ios.h"
2424
#include "app/src/assert.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2526
#include "app/src/include/firebase/version.h"
2627
#include "app/src/log.h"
27-
#include "app/src/mutex.h"
2828
#include "app/src/util.h"
2929
#include "app/src/util_ios.h"
3030

‎app/src/callback.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include <list>
2020

2121
#include "app/memory/shared_ptr.h"
22+
#include "app/src/include/firebase/internal/mutex.h"
2223
#include "app/src/log.h"
23-
#include "app/src/mutex.h"
2424
#include "app/src/semaphore.h"
2525
#include "app/src/thread.h"
2626

‎app/src/cleanup_notifier.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <map>
2121
#include <vector>
2222

23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626

‎app/src/function_registry.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <map>
2121

22-
#include "app/src/mutex.h"
22+
#include "app/src/include/firebase/internal/mutex.h"
2323

2424
namespace firebase {
2525
class App;

‎app/src/future_manager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <set>
2222

2323
#include "app/src/include/firebase/future.h"
24-
#include "app/src/mutex.h"
24+
#include "app/src/include/firebase/internal/mutex.h"
2525
#include "app/src/reference_counted_future_impl.h"
2626

2727
namespace firebase {

‎app/src/heartbeat_date_storage_desktop.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <utility>
2121

2222
#include "app/src/filesystem.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626

‎app/src/invites/android/invites_android_helper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include <jni.h>
2323

2424
#include "app/src/include/firebase/app.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2526
#include "app/src/invites/sender_receiver_interface.h"
26-
#include "app/src/mutex.h"
2727
#include "app/src/util_android.h"
2828

2929
namespace firebase {

‎app/src/invites/cached_receiver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include <string>
2121

22+
#include "app/src/include/firebase/internal/mutex.h"
2223
#include "app/src/invites/receiver_interface.h"
23-
#include "app/src/mutex.h"
2424

2525
namespace firebase {
2626
namespace invites {

‎app/src/invites/invites_receiver_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
#include "app/src/include/firebase/app.h"
2525
#include "app/src/include/firebase/future.h"
26+
#include "app/src/include/firebase/internal/mutex.h"
2627
#include "app/src/invites/cached_receiver.h"
2728
#include "app/src/invites/receiver_interface.h"
2829
#include "app/src/invites/sender_receiver_interface.h"
29-
#include "app/src/mutex.h"
3030
#include "app/src/reference_counted_future_impl.h"
3131

3232
namespace firebase {

‎app/src/invites/ios/invites_receiver_internal_ios.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
#include "app/src/assert.h"
2525
#include "app/src/include/firebase/app.h"
26+
#include "app/src/include/firebase/internal/mutex.h"
2627
#include "app/src/invites/invites_receiver_internal.h"
2728
#include "app/src/invites/ios/invites_ios_startup.h"
2829
#include "app/src/log.h"
29-
#include "app/src/mutex.h"
3030
#include "app/src/util_ios.h"
3131

3232
#include "FIRDynamicLink.h"

‎app/src/log.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <cstdlib>
2323

2424
#include "app/src/assert.h"
25-
#include "app/src/mutex.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2626

2727
#if !defined(FIREBASE_LOG_DEBUG)
2828
#define FIREBASE_LOG_DEBUG 0

‎app/src/log_stdio.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <windows.h>
2828
#endif // FIREBASE_PLATFORM_WINDOWS
2929

30-
#include "app/src/mutex.h"
30+
#include "app/src/include/firebase/internal/mutex.h"
3131

3232
namespace firebase {
3333

‎app/src/mutex.h

-22
This file was deleted.

‎app/src/mutex_pthread.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <pthread.h>
1818

1919
#include "app/src/assert.h"
20-
#include "app/src/mutex.h"
20+
#include "app/src/include/firebase/internal/mutex.h"
2121

2222
namespace firebase {
2323

‎app/src/mutex_windows.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include <windows.h>
1717

1818
#include "app/src/assert.h"
19+
#include "app/src/include/firebase/internal/mutex.h"
1920
#include "app/src/include/firebase/internal/platform.h"
20-
#include "app/src/mutex.h"
2121

2222
namespace firebase {
2323

‎app/src/reference_count.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef FIREBASE_APP_SRC_REFERENCE_COUNT_H_
1818
#define FIREBASE_APP_SRC_REFERENCE_COUNT_H_
1919

20-
#include "app/src/mutex.h"
20+
#include "app/src/include/firebase/internal/mutex.h"
2121

2222
namespace firebase {
2323
namespace internal {

‎app/src/reference_counted_future_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
#include "app/src/assert.h"
2424
#include "app/src/include/firebase/future.h"
25+
#include "app/src/include/firebase/internal/mutex.h"
2526
#include "app/src/intrusive_list.h"
2627
#include "app/src/log.h"
27-
#include "app/src/mutex.h"
2828

2929
// Set this to 1 to enable verbose logging in this module.
3030
#if !defined(FIREBASE_FUTURE_TRACE_ENABLE)

‎app/src/reference_counted_future_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "app/src/cleanup_notifier.h"
2626
#include "app/src/include/firebase/future.h"
2727
#include "app/src/include/firebase/internal/common.h"
28-
#include "app/src/mutex.h"
28+
#include "app/src/include/firebase/internal/mutex.h"
2929

3030
namespace firebase {
3131

‎app/src/safe_reference.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define FIREBASE_APP_SRC_SAFE_REFERENCE_H_
1717

1818
#include "app/memory/shared_ptr.h"
19-
#include "app/src/mutex.h"
19+
#include "app/src/include/firebase/internal/mutex.h"
2020

2121
namespace firebase {
2222
namespace internal {

‎app/src/scheduler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "app/memory/shared_ptr.h"
2323
#include "app/src/callback.h"
24-
#include "app/src/mutex.h"
24+
#include "app/src/include/firebase/internal/mutex.h"
2525
#include "app/src/semaphore.h"
2626
#include "app/src/thread.h"
2727
#include "firebase/internal/common.h"

‎app/src/semaphore.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <cassert>
3838

3939
#if FIREBASE_PLATFORM_OSX || FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
40-
#include "app/src/mutex.h"
40+
#include "app/src/include/firebase/internal/mutex.h"
4141
#include "app/src/pthread_condvar.h"
4242
#endif // FIREBASE_PLATFORM_OSX || FIREBASE_PLATFORM_IOS ||
4343
// FIREBASE_PLATFORM_TVOS

0 commit comments

Comments
 (0)