From b47c9ca12e37445b05bd80c79ae66e7804197d85 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 4 Apr 2024 17:57:42 -0700 Subject: [PATCH 1/2] Hide some private auth functions from swig --- auth/src/include/firebase/auth.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/auth/src/include/firebase/auth.h b/auth/src/include/firebase/auth.h index 9fdab7810b..17fd2a9d2d 100644 --- a/auth/src/include/firebase/auth.h +++ b/auth/src/include/firebase/auth.h @@ -669,10 +669,12 @@ class Auth { friend class UserDesktopTest; friend class AuthDesktopTest; +#ifndef SWIG friend void EnableTokenAutoRefresh(AuthData* authData); friend void DisableTokenAutoRefresh(AuthData* authData); friend void ResetTokenRefreshCounter(AuthData* authData); friend void LogHeartbeat(Auth* auth); +#endif // not SWIG /// @endcond // Find Auth instance using App. Return null if the instance does not exist. From 63d664bea69f52e21cc2c46e749b7264d305dd11 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 4 Apr 2024 18:28:51 -0700 Subject: [PATCH 2/2] Hide more methods --- database/src/include/firebase/database.h | 2 ++ database/src/include/firebase/database/mutable_data.h | 2 ++ .../src/include/firebase/firestore/aggregate_query_snapshot.h | 2 ++ firestore/src/include/firebase/firestore/document_change.h | 2 ++ firestore/src/include/firebase/firestore/document_snapshot.h | 2 ++ firestore/src/include/firebase/firestore/query.h | 2 ++ firestore/src/include/firebase/firestore/query_snapshot.h | 2 ++ 7 files changed, 14 insertions(+) diff --git a/database/src/include/firebase/database.h b/database/src/include/firebase/database.h index d0dc904c10..db6db1d2c0 100644 --- a/database/src/include/firebase/database.h +++ b/database/src/include/firebase/database.h @@ -181,8 +181,10 @@ class Database { LogLevel log_level() const; private: +#ifndef SWIG friend Database* GetDatabaseInstance(::firebase::App* app, const char* url, InitResult* init_result_out); +#endif // not SWIG Database(::firebase::App* app, internal::DatabaseInternal* internal); Database(const Database& src); Database& operator=(const Database& src); diff --git a/database/src/include/firebase/database/mutable_data.h b/database/src/include/firebase/database/mutable_data.h index cedfa159cc..97d716f814 100644 --- a/database/src/include/firebase/database/mutable_data.h +++ b/database/src/include/firebase/database/mutable_data.h @@ -148,7 +148,9 @@ class MutableData { friend class internal::DatabaseInternal; friend class internal::MutableDataInternal; friend class internal::Repo; +#ifndef SWIG friend MutableData GetInvalidMutableData(); +#endif // not SWIG /// @endcond explicit MutableData(internal::MutableDataInternal* internal); diff --git a/firestore/src/include/firebase/firestore/aggregate_query_snapshot.h b/firestore/src/include/firebase/firestore/aggregate_query_snapshot.h index 3ecf1745c7..bc1810c4ac 100644 --- a/firestore/src/include/firebase/firestore/aggregate_query_snapshot.h +++ b/firestore/src/include/firebase/firestore/aggregate_query_snapshot.h @@ -126,8 +126,10 @@ class AggregateQuerySnapshot { friend bool operator==(const AggregateQuerySnapshot& lhs, const AggregateQuerySnapshot& rhs); +#ifndef SWIG friend std::size_t AggregateQuerySnapshotHash( const AggregateQuerySnapshot& snapshot); +#endif // not SWIG friend struct ConverterImpl; friend class AggregateQuerySnapshotTest; diff --git a/firestore/src/include/firebase/firestore/document_change.h b/firestore/src/include/firebase/firestore/document_change.h index fbef011d29..2e05f74904 100644 --- a/firestore/src/include/firebase/firestore/document_change.h +++ b/firestore/src/include/firebase/firestore/document_change.h @@ -176,7 +176,9 @@ class DocumentChange { std::size_t Hash() const; friend bool operator==(const DocumentChange& lhs, const DocumentChange& rhs); +#ifndef SWIG friend std::size_t DocumentChangeHash(const DocumentChange& change); +#endif // not SWIG friend class FirestoreInternal; friend class Wrapper; diff --git a/firestore/src/include/firebase/firestore/document_snapshot.h b/firestore/src/include/firebase/firestore/document_snapshot.h index 7617eb5d14..f3f9acf84a 100644 --- a/firestore/src/include/firebase/firestore/document_snapshot.h +++ b/firestore/src/include/firebase/firestore/document_snapshot.h @@ -265,7 +265,9 @@ class DocumentSnapshot { friend bool operator==(const DocumentSnapshot& lhs, const DocumentSnapshot& rhs); +#ifndef SWIG friend std::size_t DocumentSnapshotHash(const DocumentSnapshot& snapshot); +#endif // not SWIG friend class DocumentChangeInternal; friend class EventListenerInternal; diff --git a/firestore/src/include/firebase/firestore/query.h b/firestore/src/include/firebase/firestore/query.h index d4dab0bf01..9cc7d5fe97 100644 --- a/firestore/src/include/firebase/firestore/query.h +++ b/firestore/src/include/firebase/firestore/query.h @@ -678,7 +678,9 @@ class Query { size_t Hash() const; friend bool operator==(const Query& lhs, const Query& rhs); +#ifndef SWIG friend size_t QueryHash(const Query& query); +#endif // not SWIG friend class FirestoreInternal; friend class QueryInternal; diff --git a/firestore/src/include/firebase/firestore/query_snapshot.h b/firestore/src/include/firebase/firestore/query_snapshot.h index 2dcf7aaf52..fc67782147 100644 --- a/firestore/src/include/firebase/firestore/query_snapshot.h +++ b/firestore/src/include/firebase/firestore/query_snapshot.h @@ -167,7 +167,9 @@ class QuerySnapshot { std::size_t Hash() const; friend bool operator==(const QuerySnapshot& lhs, const QuerySnapshot& rhs); +#ifndef SWIG friend std::size_t QuerySnapshotHash(const QuerySnapshot& snapshot); +#endif // not SWIG friend class EventListenerInternal; friend class FirestoreInternal;