diff options
author | Tobias Borgert | 2021-08-26 11:41:12 +0200 |
---|---|---|
committer | Tobias Borgert | 2021-08-26 11:49:02 +0200 |
commit | 4b3b12ce751c54195d0f6d6e646c28d5220ed9cc (patch) | |
tree | 1dd73099d1eb9e6bab963a7aa39764f6b69edbaf /Support_Protobuf_3_15_6.patch | |
parent | cca0618d00c3d9bfc708461a1b24c8b2d48e1725 (diff) | |
download | aur-4b3b12ce751c54195d0f6d6e646c28d5220ed9cc.tar.gz |
Update to v5.9.0
Diffstat (limited to 'Support_Protobuf_3_15_6.patch')
-rw-r--r-- | Support_Protobuf_3_15_6.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Support_Protobuf_3_15_6.patch b/Support_Protobuf_3_15_6.patch deleted file mode 100644 index 2b2295f361eb..000000000000 --- a/Support_Protobuf_3_15_6.patch +++ /dev/null @@ -1,17 +0,0 @@ -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(); |