AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Add missing LIBPROTOBUF_EXPORT

Browse Source
This commit is contained in:
Feng Xiao 2016-07-13 16:05:50 -07:00
parent 7a7913e442
commit 06a02488ce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/google/protobuf/util/json_util.h
View File

@ -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,