Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
6552c5af
Unverified
Commit
6552c5af
authored
Nov 15, 2017
by
Thomas Van Lenten
Committed by
GitHub
Nov 15, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3884 from dmaclach/unsafe
Simplify getter/setter method implementations
parents
af5ad246
4ba30923
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
GPBMessage.m
objectivec/GPBMessage.m
+9
-4
No files found.
objectivec/GPBMessage.m
View file @
6552c5af
...
...
@@ -2998,7 +2998,10 @@ typedef struct ResolveIvarAccessorMethodResult {
SEL
encodingSelector
;
}
ResolveIvarAccessorMethodResult
;
static
void
ResolveIvarGet
(
GPBFieldDescriptor
*
field
,
// |field| can be __unsafe_unretained because they are created at startup
// and are essentially global. No need to pay for retain/release when
// they are captured in blocks.
static
void
ResolveIvarGet
(
__unsafe_unretained
GPBFieldDescriptor
*
field
,
ResolveIvarAccessorMethodResult
*
result
)
{
GPBDataType
fieldDataType
=
GPBGetFieldDataType
(
field
);
switch
(
fieldDataType
)
{
...
...
@@ -3040,7 +3043,8 @@ static void ResolveIvarGet(GPBFieldDescriptor *field,
}
}
static
void
ResolveIvarSet
(
GPBFieldDescriptor
*
field
,
// See comment about __unsafe_unretained on ResolveIvarGet.
static
void
ResolveIvarSet
(
__unsafe_unretained
GPBFieldDescriptor
*
field
,
GPBFileSyntax
syntax
,
ResolveIvarAccessorMethodResult
*
result
)
{
GPBDataType
fieldDataType
=
GPBGetFieldDataType
(
field
);
...
...
@@ -3084,9 +3088,10 @@ static void ResolveIvarSet(GPBFieldDescriptor *field,
// NOTE: hasOrCountSel_/setHasSel_ will be NULL if the field for the given
// message should not have has support (done in GPBDescriptor.m), so there is
// no need for checks here to see if has*/setHas* are allowed.
ResolveIvarAccessorMethodResult
result
=
{
NULL
,
NULL
};
for
(
GPBFieldDescriptor
*
field
in
descriptor
->
fields_
)
{
// See comment about __unsafe_unretained on ResolveIvarGet.
for
(
__unsafe_unretained
GPBFieldDescriptor
*
field
in
descriptor
->
fields_
)
{
BOOL
isMapOrArray
=
GPBFieldIsMapOrArray
(
field
);
if
(
!
isMapOrArray
)
{
// Single fields.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment