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
3d32de9b
Commit
3d32de9b
authored
Aug 30, 2018
by
Brandon Cole
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code fixes for the original unit test.
Credit goes to @mercret for the fix.
parent
d83a9f66
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
protostream_objectwriter.cc
...google/protobuf/util/internal/protostream_objectwriter.cc
+13
-1
protostream_objectwriter.h
src/google/protobuf/util/internal/protostream_objectwriter.h
+5
-0
No files found.
src/google/protobuf/util/internal/protostream_objectwriter.cc
View file @
3d32de9b
...
...
@@ -73,6 +73,18 @@ ProtoStreamObjectWriter::ProtoStreamObjectWriter(
set_use_lower_camel_for_enums
(
options_
.
use_lower_camel_for_enums
);
}
ProtoStreamObjectWriter
::
ProtoStreamObjectWriter
(
const
TypeInfo
*
typeinfo
,
const
google
::
protobuf
::
Type
&
type
,
strings
::
ByteSink
*
output
,
ErrorListener
*
listener
,
const
ProtoStreamObjectWriter
::
Options
&
options
)
:
ProtoWriter
(
typeinfo
,
type
,
output
,
listener
),
master_type_
(
type
),
current_
(
nullptr
),
options_
(
options
)
{
set_ignore_unknown_fields
(
options_
.
ignore_unknown_fields
);
set_use_lower_camel_for_enums
(
options
.
use_lower_camel_for_enums
);
}
ProtoStreamObjectWriter
::
ProtoStreamObjectWriter
(
const
TypeInfo
*
typeinfo
,
const
google
::
protobuf
::
Type
&
type
,
strings
::
ByteSink
*
output
,
ErrorListener
*
listener
)
...
...
@@ -342,7 +354,7 @@ void ProtoStreamObjectWriter::AnyWriter::StartAny(const DataPiece& value) {
// Create our object writer and initialize it with the first StartObject
// call.
ow_
.
reset
(
new
ProtoStreamObjectWriter
(
parent_
->
typeinfo
(),
*
type
,
&
output_
,
parent_
->
listener
()));
parent_
->
listener
()
,
parent_
->
options_
));
// Don't call StartObject() for well-known types yet. Depending on the
// type of actual data, we may not need to call StartObject(). For
...
...
src/google/protobuf/util/internal/protostream_objectwriter.h
View file @
3d32de9b
...
...
@@ -323,6 +323,11 @@ class LIBPROTOBUF_EXPORT ProtoStreamObjectWriter : public ProtoWriter {
const
google
::
protobuf
::
Type
&
type
,
strings
::
ByteSink
*
output
,
ErrorListener
*
listener
);
ProtoStreamObjectWriter
(
const
TypeInfo
*
typeinfo
,
const
google
::
protobuf
::
Type
&
type
,
strings
::
ByteSink
*
output
,
ErrorListener
*
listener
,
const
ProtoStreamObjectWriter
::
Options
&
options
);
// Returns true if the field is a map.
inline
bool
IsMap
(
const
google
::
protobuf
::
Field
&
field
);
...
...
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