aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2016-07-13 16:05:50 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2016-07-13 16:05:50 -0700
commit06a02488ce326e4e4dc0c1bd3d66853c5de88d73 (patch)
tree1b1d4c55ad3ad80fb728c1db8efc42ff6ae88447
parent7a7913e442f91a84518bcc916dc3e5f928014f1e (diff)
downloadprotobuf-06a02488ce326e4e4dc0c1bd3d66853c5de88d73.tar.gz
protobuf-06a02488ce326e4e4dc0c1bd3d66853c5de88d73.tar.bz2
protobuf-06a02488ce326e4e4dc0c1bd3d66853c5de88d73.zip
Add missing LIBPROTOBUF_EXPORT
-rw-r--r--src/google/protobuf/util/json_util.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/util/json_util.h b/src/google/protobuf/util/json_util.h
index 170ae91b..6d3cee52 100644
--- a/src/google/protobuf/util/json_util.h
+++ b/src/google/protobuf/util/json_util.h
@@ -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,