5151#include " app/src/cleanup_notifier.h"
5252#include " app/src/log.h"
5353#include " app/src/include/firebase/internal/mutex.h"
54- #include " app/memory/shared_ptr.h"
5554#include " app/src/cpp_instance_manager.h"
5655#include " auth/src/include/firebase/auth.h"
5756
57+ #include < assert.h>
58+
5859#include < stdexcept>
5960#include < algorithm>
60-
61- #include < assert.h >
61+ # include < memory >
62+ #include < utility >
6263%}
6364
6465%import " app/src/swig/app.i"
@@ -116,7 +117,7 @@ class AuthNotifier {
116117 AuthStateChangedDelegateFunc state_changed_delegate) {
117118 assert (auth);
118119 assert (state_changed_delegate);
119- data_ = ::firebase::MakeShared <CallbackData>();
120+ data_ = std::make_shared <CallbackData>();
120121 data_->app = &auth->app ();
121122 data_->state_changed_delegate = state_changed_delegate;
122123 data_->callback_reference = nullptr ;
@@ -156,13 +157,13 @@ class AuthNotifier {
156157 if (!data_) return ;
157158
158159 data_->callback_reference = firebase::callback::AddCallback (
159- new firebase::callback::CallbackValue1<::firebase::SharedPtr <CallbackData>>(
160+ new firebase::callback::CallbackValue1<std::shared_ptr <CallbackData>>(
160161 data_, NotifyOnTheMainThread));
161162 }
162163
163164 private:
164165 // Thunk which converts from the current calling convention to SWIGSTDCALL.
165- static void NotifyOnTheMainThread (::firebase::SharedPtr <CallbackData> data) {
166+ static void NotifyOnTheMainThread (std::shared_ptr <CallbackData> data) {
166167 {
167168 ::firebase::MutexLock lock (g_auth_notifier_mutex);
168169 if (!data->callback_reference ) return ;
@@ -172,7 +173,7 @@ class AuthNotifier {
172173 }
173174
174175 private:
175- ::firebase::SharedPtr <CallbackData> data_;
176+ std::shared_ptr <CallbackData> data_;
176177};
177178
178179// Generate a Auth listener implementation and the methods to instance it.
0 commit comments