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
8532804b
Commit
8532804b
authored
Jan 30, 2019
by
Bhargava Shastry
Committed by
Adam Cozzette
Jan 31, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes warnings in
https://github.com/google/oss-fuzz/issues/864#issuecomment-458596374
parent
41f94bf3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
arenastring.h
src/google/protobuf/arenastring.h
+2
-0
field_comparator.h
src/google/protobuf/util/field_comparator.h
+6
-6
No files found.
src/google/protobuf/arenastring.h
View file @
8532804b
...
...
@@ -195,6 +195,8 @@ struct PROTOBUF_EXPORT ArenaStringPtr {
this_ptr
->
swap
(
*
other_ptr
);
#else
std
::
swap
(
ptr_
,
other
->
ptr_
);
(
void
)
default_value
;
(
void
)
arena
;
#endif
}
...
...
src/google/protobuf/util/field_comparator.h
View file @
8532804b
...
...
@@ -182,7 +182,7 @@ class PROTOBUF_EXPORT DefaultFieldComparator : public FieldComparator {
// basic types (instead of submessages). They return true on success. One
// can use ResultFromBoolean() to convert that boolean to a ComparisonResult
// value.
bool
CompareBool
(
const
FieldDescriptor
&
field
,
bool
value_1
,
bool
value_2
)
{
bool
CompareBool
(
const
FieldDescriptor
&
/* unused */
,
bool
value_1
,
bool
value_2
)
{
return
value_1
==
value_2
;
}
...
...
@@ -199,27 +199,27 @@ class PROTOBUF_EXPORT DefaultFieldComparator : public FieldComparator {
// CompareFloat.
bool
CompareFloat
(
const
FieldDescriptor
&
field
,
float
value_1
,
float
value_2
);
bool
CompareInt32
(
const
FieldDescriptor
&
field
,
int32
value_1
,
bool
CompareInt32
(
const
FieldDescriptor
&
/* unused */
,
int32
value_1
,
int32
value_2
)
{
return
value_1
==
value_2
;
}
bool
CompareInt64
(
const
FieldDescriptor
&
field
,
int64
value_1
,
bool
CompareInt64
(
const
FieldDescriptor
&
/* unused */
,
int64
value_1
,
int64
value_2
)
{
return
value_1
==
value_2
;
}
bool
CompareString
(
const
FieldDescriptor
&
field
,
const
std
::
string
&
value_1
,
bool
CompareString
(
const
FieldDescriptor
&
/* unused */
,
const
std
::
string
&
value_1
,
const
std
::
string
&
value_2
)
{
return
value_1
==
value_2
;
}
bool
CompareUInt32
(
const
FieldDescriptor
&
field
,
uint32
value_1
,
bool
CompareUInt32
(
const
FieldDescriptor
&
/* unused */
,
uint32
value_1
,
uint32
value_2
)
{
return
value_1
==
value_2
;
}
bool
CompareUInt64
(
const
FieldDescriptor
&
field
,
uint64
value_1
,
bool
CompareUInt64
(
const
FieldDescriptor
&
/* unused */
,
uint64
value_1
,
uint64
value_2
)
{
return
value_1
==
value_2
;
}
...
...
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