diff options
author | Philippe Casgrain <github@casgrain.com> | 2018-06-05 20:38:25 +0300 |
---|---|---|
committer | Philippe Casgrain <github@casgrain.com> | 2018-06-05 20:38:25 +0300 |
commit | 3de4910a34c31ac12463fc12abedaf24b86d639e (patch) | |
tree | 3e1805b9c27db5a904234c10b5398575aa410963 /src | |
parent | 114ca97f5ea345fa9a28a172be13ab379e9d3466 (diff) |
Added attributes to method implementations
In Xcode 10, if the `__attribute__((noescape))` is present in the header file,
it must also be present in the implementation.
Diffstat (limited to 'src')
-rw-r--r-- | src/fmdb/FMDatabase.m | 4 | ||||
-rwxr-xr-x | src/fmdb/FMDatabasePool.m | 10 | ||||
-rwxr-xr-x | src/fmdb/FMDatabaseQueue.m | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/fmdb/FMDatabase.m b/src/fmdb/FMDatabase.m index 43377bd..785ebab 100644 --- a/src/fmdb/FMDatabase.m +++ b/src/fmdb/FMDatabase.m @@ -1272,7 +1272,7 @@ int FMDBExecuteBulkSQLCallback(void *theBlockAsVoid, int columns, char **values, return [self executeStatements:sql withResultBlock:nil]; } -- (BOOL)executeStatements:(NSString *)sql withResultBlock:(FMDBExecuteStatementsCallbackBlock)block { +- (BOOL)executeStatements:(NSString *)sql withResultBlock:(__attribute__((noescape)) FMDBExecuteStatementsCallbackBlock)block { int rc; char *errmsg = nil; @@ -1434,7 +1434,7 @@ static NSString *FMDBEscapeSavePointName(NSString *savepointName) { #endif } -- (NSError*)inSavePoint:(void (^)(BOOL *rollback))block { +- (NSError*)inSavePoint:(__attribute__((noescape)) void (^)(BOOL *rollback))block { #if SQLITE_VERSION_NUMBER >= 3007000 static unsigned long savePointIdx = 0; diff --git a/src/fmdb/FMDatabasePool.m b/src/fmdb/FMDatabasePool.m index 1a319af..79b6b11 100755 --- a/src/fmdb/FMDatabasePool.m +++ b/src/fmdb/FMDatabasePool.m @@ -241,7 +241,7 @@ typedef NS_ENUM(NSInteger, FMDBTransaction) { }]; } -- (void)inDatabase:(void (^)(FMDatabase *db))block { +- (void)inDatabase:(__attribute__((noescape)) void (^)(FMDatabase *db))block { FMDatabase *db = [self db]; @@ -281,15 +281,15 @@ typedef NS_ENUM(NSInteger, FMDBTransaction) { [self pushDatabaseBackInPool:db]; } -- (void)inTransaction:(void (^)(FMDatabase *db, BOOL *rollback))block { +- (void)inTransaction:(__attribute__((noescape)) void (^)(FMDatabase *db, BOOL *rollback))block { [self beginTransaction:FMDBTransactionExclusive withBlock:block]; } -- (void)inDeferredTransaction:(void (^)(FMDatabase *db, BOOL *rollback))block { +- (void)inDeferredTransaction:(__attribute__((noescape)) void (^)(FMDatabase *db, BOOL *rollback))block { [self beginTransaction:FMDBTransactionDeferred withBlock:block]; } -- (void)inExclusiveTransaction:(void (^)(FMDatabase *db, BOOL *rollback))block { +- (void)inExclusiveTransaction:(__attribute__((noescape)) void (^)(FMDatabase *db, BOOL *rollback))block { [self beginTransaction:FMDBTransactionExclusive withBlock:block]; } @@ -297,7 +297,7 @@ typedef NS_ENUM(NSInteger, FMDBTransaction) { [self beginTransaction:FMDBTransactionImmediate withBlock:block]; } -- (NSError*)inSavePoint:(void (^)(FMDatabase *db, BOOL *rollback))block { +- (NSError*)inSavePoint:(__attribute__((noescape)) void (^)(FMDatabase *db, BOOL *rollback))block { #if SQLITE_VERSION_NUMBER >= 3007000 static unsigned long savePointIdx = 0; diff --git a/src/fmdb/FMDatabaseQueue.m b/src/fmdb/FMDatabaseQueue.m index 5e96a77..de01398 100755 --- a/src/fmdb/FMDatabaseQueue.m +++ b/src/fmdb/FMDatabaseQueue.m @@ -177,7 +177,7 @@ static const void * const kDispatchQueueSpecificKey = &kDispatchQueueSpecificKey return _db; } -- (void)inDatabase:(void (^)(FMDatabase *db))block { +- (void)inDatabase:(__attribute__((noescape)) void (^)(FMDatabase *db))block { #ifndef NDEBUG /* Get the currently executing queue (which should probably be nil, but in theory could be another DB queue * and then check it against self to make sure we're not about to deadlock. */ @@ -240,23 +240,23 @@ static const void * const kDispatchQueueSpecificKey = &kDispatchQueueSpecificKey FMDBRelease(self); } -- (void)inTransaction:(void (^)(FMDatabase *db, BOOL *rollback))block { +- (void)inTransaction:(__attribute__((noescape)) void (^)(FMDatabase *db, BOOL *rollback))block { [self beginTransaction:FMDBTransactionExclusive withBlock:block]; } -- (void)inDeferredTransaction:(void (^)(FMDatabase *db, BOOL *rollback))block { +- (void)inDeferredTransaction:(__attribute__((noescape)) void (^)(FMDatabase *db, BOOL *rollback))block { [self beginTransaction:FMDBTransactionDeferred withBlock:block]; } -- (void)inExclusiveTransaction:(void (^)(FMDatabase *db, BOOL *rollback))block { +- (void)inExclusiveTransaction:(__attribute__((noescape)) void (^)(FMDatabase *db, BOOL *rollback))block { [self beginTransaction:FMDBTransactionExclusive withBlock:block]; } -- (void)inImmediateTransaction:(void (^)(FMDatabase * _Nonnull, BOOL * _Nonnull))block { +- (void)inImmediateTransaction:(__attribute__((noescape)) void (^)(FMDatabase * _Nonnull, BOOL * _Nonnull))block { [self beginTransaction:FMDBTransactionImmediate withBlock:block]; } -- (NSError*)inSavePoint:(void (^)(FMDatabase *db, BOOL *rollback))block { +- (NSError*)inSavePoint:(__attribute__((noescape)) void (^)(FMDatabase *db, BOOL *rollback))block { #if SQLITE_VERSION_NUMBER >= 3007000 static unsigned long savePointIdx = 0; __block NSError *err = 0x00; |