diff options
| author |  Gil <mcg@google.com> | 2018-01-31 11:23:55 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-31 11:23:55 -0800 |
| commit | 729b8d176c75ecc0cbbd137cc6811116a64e310a (patch) | |
| tree | 22b793b03611ce5ad615b7c7d9579f5ba5206b4a /Firestore/Source/Local/FSTLevelDB.h | |
| parent | 693d0649bfcc9c32201e2431ae08ea85fdbdb617 (diff) | |
Move all Firestore Objective-C to Objective-C++ (#734)
* Move all Firestore files to Objective-C++
* Update project file references
* Don't use module imports from Objective-C++
* Use extern "C" for C-accessible globals
* Work around more stringent type checking in Objective-C++
* NSMutableDictionary ivars aren't implicitly casted to NSDictionary
* FSTMaybeDocument callback can't be passed a function that accepts
FSTDocument
* NSComparisonResult can't be multiplied by -1 without casting
* Add a #include <inttypes.h> where needed
* Avoid using C++ keywords as variables
* Remove #if __cplusplus guards
Diffstat (limited to 'Firestore/Source/Local/FSTLevelDB.h')
| -rw-r--r-- | Firestore/Source/Local/FSTLevelDB.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Firestore/Source/Local/FSTLevelDB.h b/Firestore/Source/Local/FSTLevelDB.h index 6819116..520557a 100644 --- a/Firestore/Source/Local/FSTLevelDB.h +++ b/Firestore/Source/Local/FSTLevelDB.h @@ -16,17 +16,10 @@ #import <Foundation/Foundation.h> -#import "Firestore/Source/Local/FSTPersistence.h" - -#ifdef __cplusplus #include <memory> -namespace leveldb { -class DB; -class ReadOptions; -class Status; -} -#endif +#import "Firestore/Source/Local/FSTPersistence.h" +#include "leveldb/db.h" @class FSTDatabaseInfo; @class FSTLocalSerializer; @@ -69,7 +62,6 @@ NS_ASSUME_NONNULL_BEGIN */ - (BOOL)start:(NSError **)error; -#ifdef __cplusplus // What follows is the Objective-C++ extension to the API. /** * @return A standard set of read options @@ -103,8 +95,6 @@ NS_ASSUME_NONNULL_BEGIN /** The native db pointer, allocated during start. */ @property(nonatomic, assign, readonly) std::shared_ptr<leveldb::DB> ptr; -#endif - @end NS_ASSUME_NONNULL_END |