diff options
Diffstat (limited to 'Support_Protobuf_3_15_6.patch')
| -rw-r--r-- | Support_Protobuf_3_15_6.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Support_Protobuf_3_15_6.patch b/Support_Protobuf_3_15_6.patch new file mode 100644 index 000000000000..2b2295f361eb --- /dev/null +++ b/Support_Protobuf_3_15_6.patch @@ -0,0 +1,17 @@ +Index: ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp b/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp +--- a/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp (revision b160392e47800319a498b2ff30c85cb418bb794c) ++++ b/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp (date 1621537593314) +@@ -160,7 +160,7 @@ + binary_input.assign((char*)data_->buf, static_cast<size_t>(data_->size)); + msg_ptr.clear(); + auto status = google::protobuf::util::BinaryToJsonString(resolver_.get(), topic_type_full, binary_input, &msg_ptr, options); +- if (status == google::protobuf::util::Status::OK) ++ if (status.ok()) + { + SReceiveCallbackData cb_data; + cb_data.buf = (void*)msg_ptr.c_str(); |