Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Objc query leak fix #9

Merged
merged 2 commits into from
Oct 9, 2013
Merged

Objc query leak fix #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d5c402
Fix for query leakage (circular strong reference)
jjepsen Oct 9, 2013
71acfe9
Merge branch 'master' of github.com:Tightdb/tightdb_objc into objc-qu…
jjepsen Oct 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/tightdb/objc/query_objc.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ -(TightdbQuery *)column:(size_t)colNdx isLessThanOrEqualToDate:(time_t)value

@implementation TightdbQueryAccessorBool
{
TightdbQuery *_query;
__weak TightdbQuery *_query;
size_t _column_ndx;
}
-(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query
Expand All @@ -682,7 +682,7 @@ -(TightdbQuery *)columnIsEqualTo:(BOOL)value

@implementation TightdbQueryAccessorInt
{
TightdbQuery *_query;
__weak TightdbQuery *_query;
size_t _column_ndx;
}
-(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query
Expand Down Expand Up @@ -789,7 +789,7 @@ -(NSNumber *)averageWithError:(NSError *__autoreleasing *)error

@implementation TightdbQueryAccessorFloat
{
TightdbQuery *_query;
__weak TightdbQuery *_query;
size_t _column_ndx;
}
-(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query
Expand Down Expand Up @@ -882,7 +882,7 @@ -(NSNumber *)averageWithError:(NSError *__autoreleasing *)error

@implementation TightdbQueryAccessorDouble
{
TightdbQuery *_query;
__weak TightdbQuery *_query;
size_t _column_ndx;
}
-(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query
Expand Down Expand Up @@ -975,7 +975,7 @@ -(NSNumber *)averageWithError:(NSError *__autoreleasing *)error

@implementation TightdbQueryAccessorString
{
TightdbQuery *_query;
__weak TightdbQuery *_query;
size_t _column_ndx;
}
-(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query
Expand Down Expand Up @@ -1042,7 +1042,7 @@ -(TightdbQuery *)columnContains:(NSString *)value caseSensitive:(BOOL)caseSensit

@implementation TightdbQueryAccessorBinary
{
TightdbQuery *_query;
__weak TightdbQuery *_query;
size_t _column_ndx;
}
-(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query
Expand Down Expand Up @@ -1084,7 +1084,7 @@ -(TightdbQuery *)columnContains:(TightdbBinary *)value

@implementation TightdbQueryAccessorDate
{
TightdbQuery *_query;
__weak TightdbQuery *_query;
size_t _column_ndx;
}
-(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query
Expand Down Expand Up @@ -1136,7 +1136,7 @@ -(TightdbQuery *)columnIsBetween:(time_t)from and_:(time_t)to

@implementation TightdbQueryAccessorSubtable
{
TightdbQuery *_query;
__weak TightdbQuery *_query;
size_t _column_ndx;
}
-(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query
Expand All @@ -1153,7 +1153,7 @@ -(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query

@implementation TightdbQueryAccessorMixed
{
TightdbQuery *_query;
__weak TightdbQuery *_query;
size_t _column_ndx;
}
-(id)initWithColumn:(size_t)columnId query:(TightdbQuery *)query
Expand Down