Skip to content

Commit

Permalink
fix: duplicate symbol in Database
Browse files Browse the repository at this point in the history
  • Loading branch information
YoloMao committed Oct 13, 2021
1 parent 8ebdf79 commit a68bcb6
Show file tree
Hide file tree
Showing 5 changed files with 102 additions and 102 deletions.
48 changes: 24 additions & 24 deletions GrowingToolsKit/EventsList/Database/FMDB/GrowingTKFMDatabase.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,32 +43,32 @@


#if ! __has_feature(objc_arc)
#define FMG3DBAutorelease(__v) ([__v autorelease]);
#define FMG3DBReturnAutoreleased FMG3DBAutorelease
#define GrowingTKFMDBAutorelease(__v) ([__v autorelease]);
#define GrowingTKFMDBReturnAutoreleased GrowingTKFMDBAutorelease

#define FMG3DBRetain(__v) ([__v retain]);
#define FMG3DBReturnRetained FMG3DBRetain
#define GrowingTKFMDBRetain(__v) ([__v retain]);
#define GrowingTKFMDBReturnRetained GrowingTKFMDBRetain

#define FMG3DBRelease(__v) ([__v release]);
#define GrowingTKFMDBRelease(__v) ([__v release]);

#define FMG3DBDispatchQueueRelease(__v) (dispatch_release(__v));
#define GrowingTKFMDBDispatchQueueRelease(__v) (dispatch_release(__v));
#else
// -fobjc-arc
#define FMG3DBAutorelease(__v)
#define FMG3DBReturnAutoreleased(__v) (__v)
#define GrowingTKFMDBAutorelease(__v)
#define GrowingTKFMDBReturnAutoreleased(__v) (__v)

#define FMG3DBRetain(__v)
#define FMG3DBReturnRetained(__v) (__v)
#define GrowingTKFMDBRetain(__v)
#define GrowingTKFMDBReturnRetained(__v) (__v)

#define FMG3DBRelease(__v)
#define GrowingTKFMDBRelease(__v)

// If OS_OBJECT_USE_OBJC=1, then the dispatch objects will be treated like ObjC objects
// and will participate in ARC.
// See the section on "Dispatch Queues and Automatic Reference Counting" in "Grand Central Dispatch (GCD) Reference" for details.
#if OS_OBJECT_USE_OBJC
#define FMG3DBDispatchQueueRelease(__v)
#define GrowingTKFMDBDispatchQueueRelease(__v)
#else
#define FMG3DBDispatchQueueRelease(__v) (dispatch_release(__v));
#define GrowingTKFMDBDispatchQueueRelease(__v) (dispatch_release(__v));
#endif
#endif

Expand All @@ -77,13 +77,13 @@
#endif


typedef int(^FMG3DBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictionary);
typedef int(^GrowingTKFMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictionary);


/** A SQLite ([http://sqlite.org/](http://sqlite.org/)) Objective-C wrapper.
### Usage
The three main classes in FMG3DB are:
The three main classes in GrowingTKFMDB are:
- `FMG3Database` - Represents a single SQLite database. Used for executing SQL statements.
- `<GrowingTKFMResultSet>` - Represents the results of executing a query on an `FMG3Database`.
Expand All @@ -96,9 +96,9 @@ typedef int(^FMG3DBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictiona
### External links
- [FMG3DB on GitHub](https://github.com/ccgus/FMG3DB) including introductory documentation
- [GrowingTKFMDB on GitHub](https://github.com/ccgus/GrowingTKFMDB) including introductory documentation
- [SQLite web site](http://sqlite.org/)
- [FMG3DB mailing list](http://groups.google.com/group/FMG3DB)
- [GrowingTKFMDB mailing list](http://groups.google.com/group/GrowingTKFMDB)
- [SQLite FAQ](http://www.sqlite.org/faq.html)
@warning Do not instantiate a single `FMG3Database` object and use it across multiple threads. Instead, use `<GrowingTKFMDatabaseQueue>`.
Expand Down Expand Up @@ -493,7 +493,7 @@ typedef int(^FMG3DBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictiona
*/

- (BOOL)executeStatements:(NSString *)sql withResultBlock:(FMG3DBExecuteStatementsCallbackBlock)block;
- (BOOL)executeStatements:(NSString *)sql withResultBlock:(GrowingTKFMDBExecuteStatementsCallbackBlock)block;

/** Last insert rowid
Expand Down Expand Up @@ -979,9 +979,9 @@ typedef int(^FMG3DBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictiona
+ (NSString*)sqliteLibVersion;


+ (NSString*)FMG3DBUserVersion;
+ (NSString*)GrowingTKFMDBUserVersion;

+ (SInt32)FMG3DBVersion;
+ (SInt32)GrowingTKFMDBVersion;


///------------------------
Expand Down Expand Up @@ -1020,7 +1020,7 @@ typedef int(^FMG3DBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictiona
rowCount++;
NSLog(@"Does %@ start with 'h'?", [rs stringForColumnIndex:0]);
}
FMG3DBQuickCheck(rowCount == 2);
GrowingTKFMDBQuickCheck(rowCount == 2);
}];
@param name Name of function
Expand Down Expand Up @@ -1057,7 +1057,7 @@ typedef int(^FMG3DBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictiona
@see stringFromDate:
@see storeableDateFormat:
@warning Note that `NSDateFormatter` is not thread-safe, so the formatter generated by this method should be assigned to only one FMG3DB instance and should not be used for other purposes.
@warning Note that `NSDateFormatter` is not thread-safe, so the formatter generated by this method should be assigned to only one GrowingTKFMDB instance and should not be used for other purposes.
*/

Expand Down Expand Up @@ -1086,7 +1086,7 @@ typedef int(^FMG3DBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictiona
@see stringFromDate:
@see storeableDateFormat:
@warning Note there is no direct getter for the `NSDateFormatter`, and you should not use the formatter you pass to FMG3DB for other purposes, as `NSDateFormatter` is not thread-safe.
@warning Note there is no direct getter for the `NSDateFormatter`, and you should not use the formatter you pass to GrowingTKFMDB for other purposes, as `NSDateFormatter` is not thread-safe.
*/

- (void)setDateFormat:(NSDateFormatter *)format;
Expand Down Expand Up @@ -1126,7 +1126,7 @@ typedef int(^FMG3DBExecuteStatementsCallbackBlock)(NSDictionary *resultsDictiona

/** Objective-C wrapper for `sqlite3_stmt`
This is a wrapper for a SQLite `sqlite3_stmt`. Generally when using FMG3DB you will not need to interact directly with `GrowingTKFMStatement`, but rather with `<FMG3Database>` and `<GrowingTKFMResultSet>` only.
This is a wrapper for a SQLite `sqlite3_stmt`. Generally when using GrowingTKFMDB you will not need to interact directly with `GrowingTKFMStatement`, but rather with `<FMG3Database>` and `<GrowingTKFMResultSet>` only.
### See also
Expand Down
Loading

0 comments on commit a68bcb6

Please sign in to comment.