summarylogtreecommitdiffstats
path: root/Support_Protobuf_3_15_6.patch
diff options
context:
space:
mode:
authorTobias Borgert2021-05-21 23:30:45 +0200
committerTobias Borgert2021-05-21 23:30:45 +0200
commitd77a2da74e155cb4ef0d378e4dfb6f37e7ee49f8 (patch)
treeed42f4b0b8ae81674ac369ab16b85000032ac8f8 /Support_Protobuf_3_15_6.patch
parentfc1e205d898786585dc42087c02add0bc2ae20ea (diff)
downloadaur-d77a2da74e155cb4ef0d378e4dfb6f37e7ee49f8.tar.gz
Update to v5.8.8
Diffstat (limited to 'Support_Protobuf_3_15_6.patch')
-rw-r--r--Support_Protobuf_3_15_6.patch17
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();