Skip to content

Delete app/src/mutex.h and adjust includes to app/src/include/firebase/internal/mutex.h #795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2021
Merged

Delete app/src/mutex.h and adjust includes to app/src/include/firebase/internal/mutex.h #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c87d2ed
Revert "Add back app/src/mutex.h that just redirects to app/src/inclu…
dconeybe Dec 16, 2021
9f5a58e
Revert "Revert "Adjust include paths to mutex.h"."
dconeybe Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admob/src/android/banner_view_internal_android.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion admob/src/android/native_express_ad_view_internal_android.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion admob/src/common/banner_view_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion admob/src/common/banner_view_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion admob/src/common/interstitial_ad_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion admob/src/common/interstitial_ad_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion admob/src/common/native_express_ad_view_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion admob/src/common/native_express_ad_view_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion admob/src/common/rewarded_video.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion admob/src/common/rewarded_video_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion admob/src/common/rewarded_video_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion analytics/src/analytics_ios.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/rest/controller_curl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/rest/controller_curl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/rest/transport_curl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/rest/transport_curl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <vector>

#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"

Expand Down
2 changes: 1 addition & 1 deletion app/rest/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <string>

#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 {
Expand Down
2 changes: 1 addition & 1 deletion app/src/app_common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion app/src/app_ios.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion app/src/callback.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <list>

#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"

Expand Down
2 changes: 1 addition & 1 deletion app/src/cleanup_notifier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <map>
#include <vector>

#include "app/src/mutex.h"
#include "app/src/include/firebase/internal/mutex.h"

namespace firebase {

Expand Down
2 changes: 1 addition & 1 deletion app/src/function_registry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <map>

#include "app/src/mutex.h"
#include "app/src/include/firebase/internal/mutex.h"

namespace firebase {
class App;
Expand Down
2 changes: 1 addition & 1 deletion app/src/future_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <set>

#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 {
Expand Down
2 changes: 1 addition & 1 deletion app/src/heartbeat_date_storage_desktop.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <utility>

#include "app/src/filesystem.h"
#include "app/src/mutex.h"
#include "app/src/include/firebase/internal/mutex.h"

namespace firebase {

Expand Down
2 changes: 1 addition & 1 deletion app/src/invites/android/invites_android_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <jni.h>

#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 {
Expand Down
2 changes: 1 addition & 1 deletion app/src/invites/cached_receiver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <string>

#include "app/src/include/firebase/internal/mutex.h"
#include "app/src/invites/receiver_interface.h"
#include "app/src/mutex.h"

namespace firebase {
namespace invites {
Expand Down
2 changes: 1 addition & 1 deletion app/src/invites/invites_receiver_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/src/invites/ios/invites_receiver_internal_ios.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/src/log.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <cstdlib>

#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
Expand Down
2 changes: 1 addition & 1 deletion app/src/log_stdio.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <windows.h>
#endif // FIREBASE_PLATFORM_WINDOWS

#include "app/src/mutex.h"
#include "app/src/include/firebase/internal/mutex.h"

namespace firebase {

Expand Down
22 changes: 0 additions & 22 deletions app/src/mutex.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/mutex_pthread.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <pthread.h>

#include "app/src/assert.h"
#include "app/src/mutex.h"
#include "app/src/include/firebase/internal/mutex.h"

namespace firebase {

Expand Down
2 changes: 1 addition & 1 deletion app/src/mutex_windows.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#include <windows.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"

namespace firebase {

Expand Down
2 changes: 1 addition & 1 deletion app/src/reference_count.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/src/reference_counted_future_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/src/reference_counted_future_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion app/src/safe_reference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/src/scheduler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/src/semaphore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <cassert>

#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
Expand Down
Loading