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/Util | |
| 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/Util')
| -rw-r--r-- | Firestore/Source/Util/FSTAsyncQueryListener.mm (renamed from Firestore/Source/Util/FSTAsyncQueryListener.m) | 0 | ||||
| -rw-r--r-- | Firestore/Source/Util/FSTDispatchQueue.mm (renamed from Firestore/Source/Util/FSTDispatchQueue.m) | 0 | ||||
| -rw-r--r-- | Firestore/Source/Util/FSTLogger.h | 8 | ||||
| -rw-r--r-- | Firestore/Source/Util/FSTLogger.mm (renamed from Firestore/Source/Util/FSTLogger.m) | 0 | ||||
| -rw-r--r-- | Firestore/Source/Util/FSTUsageValidation.h | 8 | ||||
| -rw-r--r-- | Firestore/Source/Util/FSTUsageValidation.mm (renamed from Firestore/Source/Util/FSTUsageValidation.m) | 0 |
6 files changed, 0 insertions, 16 deletions
diff --git a/Firestore/Source/Util/FSTAsyncQueryListener.m b/Firestore/Source/Util/FSTAsyncQueryListener.mm index d98e2dd..d98e2dd 100644 --- a/Firestore/Source/Util/FSTAsyncQueryListener.m +++ b/Firestore/Source/Util/FSTAsyncQueryListener.mm diff --git a/Firestore/Source/Util/FSTDispatchQueue.m b/Firestore/Source/Util/FSTDispatchQueue.mm index 6ce5d74..6ce5d74 100644 --- a/Firestore/Source/Util/FSTDispatchQueue.m +++ b/Firestore/Source/Util/FSTDispatchQueue.mm diff --git a/Firestore/Source/Util/FSTLogger.h b/Firestore/Source/Util/FSTLogger.h index 699570a..c4e2b85 100644 --- a/Firestore/Source/Util/FSTLogger.h +++ b/Firestore/Source/Util/FSTLogger.h @@ -18,17 +18,9 @@ NS_ASSUME_NONNULL_BEGIN -#ifdef __cplusplus -extern "C" { -#endif - /** Logs to NSLog if [FIRFirestore isLoggingEnabled] is YES. */ void FSTLog(NSString *format, ...) NS_FORMAT_FUNCTION(1, 2); void FSTWarn(NSString *format, ...) NS_FORMAT_FUNCTION(1, 2); -#ifdef __cplusplus -} // extern "C" -#endif - NS_ASSUME_NONNULL_END diff --git a/Firestore/Source/Util/FSTLogger.m b/Firestore/Source/Util/FSTLogger.mm index f0081e0..f0081e0 100644 --- a/Firestore/Source/Util/FSTLogger.m +++ b/Firestore/Source/Util/FSTLogger.mm diff --git a/Firestore/Source/Util/FSTUsageValidation.h b/Firestore/Source/Util/FSTUsageValidation.h index 34a3d64..a80dafa 100644 --- a/Firestore/Source/Util/FSTUsageValidation.h +++ b/Firestore/Source/Util/FSTUsageValidation.h @@ -18,10 +18,6 @@ NS_ASSUME_NONNULL_BEGIN -#if __cplusplus -extern "C" { -#endif - /** Helper for creating a general exception for invalid usage of an API. */ NSException *FSTInvalidUsage(NSString *exceptionName, NSString *format, ...); @@ -46,8 +42,4 @@ NSException *FSTInvalidUsage(NSString *exceptionName, NSString *format, ...); @throw FSTInvalidUsage(@"FIRInvalidArgumentException", format, ##__VA_ARGS__); \ } while (0) -#if __cplusplus -} // extern "C" -#endif - NS_ASSUME_NONNULL_END diff --git a/Firestore/Source/Util/FSTUsageValidation.m b/Firestore/Source/Util/FSTUsageValidation.mm index 82128f4..82128f4 100644 --- a/Firestore/Source/Util/FSTUsageValidation.m +++ b/Firestore/Source/Util/FSTUsageValidation.mm |