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
06a02488
Commit
06a02488
authored
Jul 13, 2016
by
Feng Xiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing LIBPROTOBUF_EXPORT
parent
7a7913e4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
json_util.h
src/google/protobuf/util/json_util.h
+4
-4
No files found.
src/google/protobuf/util/json_util.h
View file @
06a02488
...
...
@@ -73,7 +73,7 @@ typedef JsonPrintOptions JsonOptions;
// Converts from protobuf message to JSON. This is a simple wrapper of
// BinaryToJsonString(). It will use the DescriptorPool of the passed-in
// message to resolve Any types.
util
::
Status
MessageToJsonString
(
const
Message
&
message
,
LIBPROTOBUF_EXPORT
util
::
Status
MessageToJsonString
(
const
Message
&
message
,
string
*
output
,
const
JsonOptions
&
options
);
...
...
@@ -85,7 +85,7 @@ inline util::Status MessageToJsonString(const Message& message,
// Converts from JSON to protobuf message. This is a simple wrapper of
// JsonStringToBinary(). It will use the DescriptorPool of the passed-in
// message to resolve Any types.
util
::
Status
JsonStringToMessage
(
const
string
&
input
,
LIBPROTOBUF_EXPORT
util
::
Status
JsonStringToMessage
(
const
string
&
input
,
Message
*
message
,
const
JsonParseOptions
&
options
);
...
...
@@ -100,7 +100,7 @@ inline util::Status JsonStringToMessage(const string& input,
// 2. input is not valid protobuf wire format, or conflicts with the type
// information returned by TypeResolver.
// Note that unknown fields will be discarded silently.
util
::
Status
BinaryToJsonStream
(
LIBPROTOBUF_EXPORT
util
::
Status
BinaryToJsonStream
(
TypeResolver
*
resolver
,
const
string
&
type_url
,
io
::
ZeroCopyInputStream
*
binary_input
,
...
...
@@ -135,7 +135,7 @@ inline util::Status BinaryToJsonString(TypeResolver* resolver,
// 1. TypeResolver fails to resolve a type.
// 2. input is not valid JSON format, or conflicts with the type
// information returned by TypeResolver.
util
::
Status
JsonToBinaryStream
(
LIBPROTOBUF_EXPORT
util
::
Status
JsonToBinaryStream
(
TypeResolver
*
resolver
,
const
string
&
type_url
,
io
::
ZeroCopyInputStream
*
json_input
,
...
...
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