Skip to content

Commit 62c88fe

Browse files
committed
Merge commit 'b6cf252a73424f9731806e0fa13ad41265375e96' into bs-databaseinterop
* commit 'b6cf252a73424f9731806e0fa13ad41265375e96': Implement necessary protocols Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase
2 parents 0ead4e7 + b6cf252 commit 62c88fe

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Firebase/Database/Api/FIRDatabase.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#import <FirebaseCore/FIRAppInternal.h>
2121
#import <FirebaseCore/FIRComponent.h>
2222
#import <FirebaseCore/FIRComponentContainer.h>
23+
#import <FirebaseCore/FIRComponentRegistrant.h>
2324
#import <FirebaseCore/FIRDependency.h>
2425
#import <FirebaseCore/FIRLogger.h>
2526
#import <FirebaseCore/FIROptions.h>
@@ -33,17 +34,16 @@
3334
#import "FRepoManager.h"
3435
#import "FValidation.h"
3536

36-
@interface FIRDatabase ()
37+
// Empty protocol for use with Interop registration.
38+
@protocol FIRDatabaseNilProtocol
39+
@end
40+
41+
@interface FIRDatabase () <FIRComponentRegistrant, FIRDatabaseNilProtocol>
3742
@property (nonatomic, strong) FRepoInfo *repoInfo;
3843
@property (nonatomic, strong) FIRDatabaseConfig *config;
3944
@property (nonatomic, strong) FRepo *repo;
4045
@end
4146

42-
43-
// Empty protocol for use with Interop registration.
44-
@protocol FIRDatabaseNilProtocol
45-
@end
46-
4747
@implementation FIRDatabase
4848

4949
/** A NSMutableDictionary of FirebaseApp name and FRepoInfo to FirebaseDatabase instance. */

0 commit comments

Comments
 (0)