487bb1b1e2
This prevents conflicts with other Python packages that also use protobuf, see e.g. #150765.
14 lines
675 B
Diff
14 lines
675 B
Diff
diff --git a/tensorflow/core/kernels/example_parsing_ops.cc b/tensorflow/core/kernels/example_parsing_ops.cc
|
|
index a1265cfb5c6..ada919bbd7b 100644
|
|
--- a/tensorflow/core/kernels/example_parsing_ops.cc
|
|
+++ b/tensorflow/core/kernels/example_parsing_ops.cc
|
|
@@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKernel {
|
|
resolver_.get(), "type.googleapis.com/tensorflow.Example", &in, &out);
|
|
OP_REQUIRES(ctx, status.ok(),
|
|
errors::InvalidArgument("Error while parsing JSON: ",
|
|
- string(status.error_message())));
|
|
+ string(status.message())));
|
|
}
|
|
}
|
|
|