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
d83837de
Commit
d83837de
authored
Jan 31, 2018
by
Thomas Van Lenten
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix to use "nil" instead of "NULL" for objc objects.
parent
81aeed08
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
Struct.pbobjc.m
objectivec/google/protobuf/Struct.pbobjc.m
+1
-1
Type.pbobjc.m
objectivec/google/protobuf/Type.pbobjc.m
+3
-3
objectivec_enum.cc
src/google/protobuf/compiler/objectivec/objectivec_enum.cc
+1
-1
No files found.
objectivec/google/protobuf/Struct.pbobjc.m
View file @
d83837de
...
...
@@ -53,7 +53,7 @@ static GPBFileDescriptor *GPBStructRoot_FileDescriptor(void) {
#pragma mark - Enum GPBNullValue
GPBEnumDescriptor
*
GPBNullValue_EnumDescriptor
(
void
)
{
static
_Atomic
(
GPBEnumDescriptor
*
)
descriptor
=
NULL
;
static
_Atomic
(
GPBEnumDescriptor
*
)
descriptor
=
nil
;
if
(
!
descriptor
)
{
static
const
char
*
valueNames
=
"NullValue
\000
"
;
...
...
objectivec/google/protobuf/Type.pbobjc.m
View file @
d83837de
...
...
@@ -56,7 +56,7 @@ static GPBFileDescriptor *GPBTypeRoot_FileDescriptor(void) {
#pragma mark - Enum GPBSyntax
GPBEnumDescriptor
*
GPBSyntax_EnumDescriptor
(
void
)
{
static
_Atomic
(
GPBEnumDescriptor
*
)
descriptor
=
NULL
;
static
_Atomic
(
GPBEnumDescriptor
*
)
descriptor
=
nil
;
if
(
!
descriptor
)
{
static
const
char
*
valueNames
=
"SyntaxProto2
\000
SyntaxProto3
\000
"
;
...
...
@@ -371,7 +371,7 @@ void SetGPBField_Cardinality_RawValue(GPBField *message, int32_t value) {
#pragma mark - Enum GPBField_Kind
GPBEnumDescriptor
*
GPBField_Kind_EnumDescriptor
(
void
)
{
static
_Atomic
(
GPBEnumDescriptor
*
)
descriptor
=
NULL
;
static
_Atomic
(
GPBEnumDescriptor
*
)
descriptor
=
nil
;
if
(
!
descriptor
)
{
static
const
char
*
valueNames
=
"TypeUnknown
\000
TypeDouble
\000
TypeFloat
\000
TypeInt"
...
...
@@ -445,7 +445,7 @@ BOOL GPBField_Kind_IsValidValue(int32_t value__) {
#pragma mark - Enum GPBField_Cardinality
GPBEnumDescriptor
*
GPBField_Cardinality_EnumDescriptor
(
void
)
{
static
_Atomic
(
GPBEnumDescriptor
*
)
descriptor
=
NULL
;
static
_Atomic
(
GPBEnumDescriptor
*
)
descriptor
=
nil
;
if
(
!
descriptor
)
{
static
const
char
*
valueNames
=
"CardinalityUnknown
\000
CardinalityOptional
\000
C"
...
...
src/google/protobuf/compiler/objectivec/objectivec_enum.cc
View file @
d83837de
...
...
@@ -149,7 +149,7 @@ void EnumGenerator::GenerateSource(io::Printer* printer) {
printer
->
Print
(
"GPBEnumDescriptor *$name$_EnumDescriptor(void) {
\n
"
" static _Atomic(GPBEnumDescriptor*) descriptor =
NULL
;
\n
"
" static _Atomic(GPBEnumDescriptor*) descriptor =
nil
;
\n
"
" if (!descriptor) {
\n
"
,
"name"
,
name_
);
...
...
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