pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/databases/mysql80-client
Module Name: pkgsrc
Committed By: jnemeth
Date: Wed Oct 15 03:52:38 UTC 2025
Modified Files:
pkgsrc/databases/mysql80-client: distinfo
Added Files:
pkgsrc/databases/mysql80-client/patches:
patch-plugin_x_client_xprotocol__impl.cc
patch-plugin_x_protocol_plugin_encoder__file__output.h
patch-plugin_x_protocol_plugin_message__field__chain.cc
patch-plugin_x_protocol_plugin_messages__used__by__server.cc
patch-plugin_x_protocol_stream_decompression__input__stream.h
patch-plugin_x_src_io_vio__input__stream.h
patch-plugin_x_src_prepare__param__handler.cc
patch-plugin_x_tests_driver_connector_session__holder.cc
patch-plugin_x_tests_driver_formatters_message__formatter.cc
patch-plugin_x_tests_driver_processor_send__message__block__processor.cc
Log Message:
PR/59670 -- patches from joerg@ to work with modern external abseil/protobuf
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/mysql80-client/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_client_xprotocol__impl.cc \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_encoder__file__output.h \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_message__field__chain.cc \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_messages__used__by__server.cc \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_stream_decompression__input__stream.h \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_src_io_vio__input__stream.h \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_src_prepare__param__handler.cc \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_connector_session__holder.cc \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_formatters_message__formatter.cc \
pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_processor_send__message__block__processor.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/databases/mysql80-client/distinfo
diff -u pkgsrc/databases/mysql80-client/distinfo:1.16 pkgsrc/databases/mysql80-client/distinfo:1.17
--- pkgsrc/databases/mysql80-client/distinfo:1.16 Sun Sep 28 16:46:33 2025
+++ pkgsrc/databases/mysql80-client/distinfo Wed Oct 15 03:52:37 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2025/09/28 16:46:33 bsiegert Exp $
+$NetBSD: distinfo,v 1.17 2025/10/15 03:52:37 jnemeth Exp $
BLAKE2s (mysql-boost-8.0.40.tar.gz) = 4fba24ee573376052daa912a055c62341c88dc5f8e6e769487dde4ebf49e6bb8
SHA512 (mysql-boost-8.0.40.tar.gz) = fcece6e3c09dc4733767effb5c22a55e4add1c9f6b6b911e1eccdd0444f08dc5714b3c8b2a40c85a75a63ff117b6c9881904b6b4732b5ca9bef96de1cb2e284a
@@ -22,7 +22,17 @@ SHA1 (patch-libmysql_CMakeLists.txt) = 7
SHA1 (patch-mysys_kqueue__timers.cc) = 837474b779c24dd0af67444c2adbcf07b73e0d36
SHA1 (patch-mysys_stacktrace.cc) = 6792ceaae3c3b0d70bd8b6c848a128d50397e6f4
SHA1 (patch-packaging_solaris_CMakeLists.txt) = 135c4aa07d9b20a9b56b8f1616821abfedb52ecb
+SHA1 (patch-plugin_x_client_xprotocol__impl.cc) = 70d00b692b76d730758b72e3d3b6add16358543a
+SHA1 (patch-plugin_x_protocol_plugin_encoder__file__output.h) = 76355089db19408860bcf8fe64c2e5c11d4aa0a6
+SHA1 (patch-plugin_x_protocol_plugin_message__field__chain.cc) = 997b361b668b1fb8a1001422615c0cc8faadf9d2
+SHA1 (patch-plugin_x_protocol_plugin_messages__used__by__server.cc) = f43c64c4479fde3db0024e8d92c0ffd2e097b26b
+SHA1 (patch-plugin_x_protocol_stream_decompression__input__stream.h) = eaf27412d366b9862fe834ebc6ec579891d03f6b
+SHA1 (patch-plugin_x_src_io_vio__input__stream.h) = cee7b855eadffe4036ced2b44f7bbbc400ca5ec7
+SHA1 (patch-plugin_x_src_prepare__param__handler.cc) = 19371a41e8627568094faa7b7a4f75f415321511
+SHA1 (patch-plugin_x_tests_driver_connector_session__holder.cc) = 371ad64e391ac3a2e6ff08948e190eb85f44aa81
SHA1 (patch-plugin_x_tests_driver_connector_warning.h) = 80d4cbe93b853348f98c54d96892648063e1f9f5
+SHA1 (patch-plugin_x_tests_driver_formatters_message__formatter.cc) = d9ebd6238844f291de7208a372e9bf6c91b359b3
+SHA1 (patch-plugin_x_tests_driver_processor_send__message__block__processor.cc) = 410f6a14e1a2320f14985f3ea99533e0cbcb3a92
SHA1 (patch-router_CMakeLists.txt) = 9bfd1278c42070ada0606dfff34a66b8b95d0413
SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h) = ade643148787438d6d6f1f7b2636bbd0af87d70f
SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_internet.h) = 29e019236423aaa77b71b273d009404e4fbafe73
Added files:
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_client_xprotocol__impl.cc
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_client_xprotocol__impl.cc:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_client_xprotocol__impl.cc Wed Oct 15 03:52:37 2025
@@ -0,0 +1,31 @@
+$NetBSD: patch-plugin_x_client_xprotocol__impl.cc,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/client/xprotocol_impl.cc.orig 2025-09-26 13:01:59.742201211 +0000
++++ plugin/x/client/xprotocol_impl.cc
+@@ -782,7 +782,7 @@ std::unique_ptr<XProtocol::Message> Prot
+ DBUG_LOG("debug", "Deserialize message: " << ret_val->GetTypeName());
+ if (!ret_val->ParseFromCodedStream(input_stream)) {
+ std::string error_message(ERR_MSG_MESSAGE_NOT_INITIALIZED);
+- error_message += "Name:" + ret_val->GetTypeName() + ", ";
++ error_message += "Name:" + std::string(ret_val->GetTypeName()) + ", ";
+ error_message += ret_val->InitializationErrorString();
+ *out_error = XError(CR_MALFORMED_PACKET, error_message);
+
+@@ -816,7 +816,7 @@ std::unique_ptr<XProtocol::Message> Prot
+
+ if (!ret_val->IsInitialized()) {
+ std::string err(ERR_MSG_MESSAGE_NOT_INITIALIZED);
+- err += "Name:" + ret_val->GetTypeName() + ", ";
++ err += "Name:" + std::string(ret_val->GetTypeName()) + ", ";
+ err += ret_val->InitializationErrorString();
+ *out_error = XError(CR_MALFORMED_PACKET, err);
+
+@@ -1122,7 +1122,7 @@ XProtocol::Message *Protocol_impl::recv_
+
+ if (!m_compressed.ParseFromCodedStream(&cis)) {
+ std::string error_message(ERR_MSG_MESSAGE_NOT_INITIALIZED);
+- error_message += "Name:" + m_compressed.GetTypeName() + ", ";
++ error_message += "Name:" + std::string(m_compressed.GetTypeName()) + ", ";
+ error_message += m_compressed.InitializationErrorString();
+ *out_error = XError(CR_MALFORMED_PACKET, error_message);
+ return nullptr;
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_encoder__file__output.h
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_encoder__file__output.h:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_encoder__file__output.h Wed Oct 15 03:52:37 2025
@@ -0,0 +1,31 @@
+$NetBSD: patch-plugin_x_protocol_plugin_encoder__file__output.h,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/protocol/plugin/encoder_file_output.h.orig 2025-09-26 12:35:32.501446532 +0000
++++ plugin/x/protocol/plugin/encoder_file_output.h
+@@ -79,7 +79,7 @@ class Encoder_file_output : public File_
+ return;
+
+ write_to_context(context, "");
+- write_to_context(context, "struct ", message->name(), " {");
++ write_to_context(context, "struct ", std::string(message->name()), " {");
+
+ if (message->options().HasExtension(Mysqlx::server_message_id)) {
+ const auto server_id_numeric = static_cast<int>(
+@@ -97,7 +97,7 @@ class Encoder_file_output : public File_
+ bool is_reserved = false;
+ const auto field = message->field(i);
+ const auto field_tag = std::to_string(field->number());
+- const auto field_name = get_cpp_field_name(field->name(), &is_reserved);
++ const auto field_name = get_cpp_field_name(std::string(field->name()), &is_reserved);
+
+ if (is_reserved) {
+ write_to_context(context,
+@@ -129,7 +129,7 @@ class Encoder_file_output : public File_
+
+ // Check if we there is a message containing Server message ID
+ if (0 == m_used_message_ids.count(enum_value->number())) {
+- std::string value = " " + enum_value->name() + " = " +
++ std::string value = std::string(" ") + std::string(enum_value->name()) + " = " +
+ std::to_string(enum_value->number());
+
+ values.push_back(value);
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_message__field__chain.cc
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_message__field__chain.cc:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_message__field__chain.cc Wed Oct 15 03:52:37 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-plugin_x_protocol_plugin_message__field__chain.cc,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/protocol/plugin/message_field_chain.cc.orig 2025-09-26 12:32:21.347349594 +0000
++++ plugin/x/protocol/plugin/message_field_chain.cc
+@@ -26,6 +26,7 @@
+ #include "plugin/x/protocol/plugin/message_field_chain.h"
+
+ #include <string>
++#include <string_view>
+
+ #include "my_compiler.h"
+ MY_COMPILER_DIAGNOSTIC_PUSH()
+@@ -58,7 +59,7 @@ bool Message_field_chain::begin_validate
+
+ // Check against cycles in Message dependencies graph
+ const bool was_node_visited =
+- message && 0 != m_types_done.count(message->full_name());
++ message && 0 != m_types_done.count(std::string(message->full_name()));
+
+ if (nullptr == message || was_node_visited || 0 == message->field_count()) {
+ m_output_file->append_chain(m_context, chain);
+@@ -74,7 +75,7 @@ bool Message_field_chain::begin_validate
+
+ void Message_field_chain::end_validate_field(const FieldDescriptor *field,
+ const Descriptor *message) {
+- m_types_done.erase(message->full_name());
++ m_types_done.erase(std::string(message->full_name()));
+ const auto position = m_chain.find_last_of(".");
+
+ if (std::string::npos != position) m_chain.resize(position);
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_messages__used__by__server.cc
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_messages__used__by__server.cc:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_plugin_messages__used__by__server.cc Wed Oct 15 03:52:37 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-plugin_x_protocol_plugin_messages__used__by__server.cc,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/protocol/plugin/messages_used_by_server.cc.orig 2025-09-26 12:39:53.077862873 +0000
++++ plugin/x/protocol/plugin/messages_used_by_server.cc
+@@ -49,14 +49,14 @@ bool Messages_used_by_server::begin_vali
+ const auto &message_options = message->options();
+
+ if (!message_options.HasExtension(Mysqlx::server_message_id)) {
+- if (0 == m_forced_packages.count(message->file()->package()))
++ if (0 == m_forced_packages.count(std::string(message->file()->package())))
+ return false;
+ }
+ }
+
+ // Check against cycles in Message dependencies graph
+ const bool was_node_visited =
+- message && 0 != m_types_done.count(message->full_name());
++ message && 0 != m_types_done.count(std::string(message->full_name()));
+
+ if (nullptr == message || was_node_visited) {
+ return false;
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_stream_decompression__input__stream.h
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_stream_decompression__input__stream.h:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_protocol_stream_decompression__input__stream.h Wed Oct 15 03:52:37 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugin_x_protocol_stream_decompression__input__stream.h,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/protocol/stream/decompression_input_stream.h.orig 2025-09-26 12:57:48.907982837 +0000
++++ plugin/x/protocol/stream/decompression_input_stream.h
+@@ -93,7 +93,7 @@ class Decompression_input_stream
+ return Skip(count - left);
+ }
+
+- google::protobuf::int64 ByteCount() const override {
++ int64_t ByteCount() const override {
+ return m_all + m_output_buffer_offset;
+ }
+
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_src_io_vio__input__stream.h
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_src_io_vio__input__stream.h:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_src_io_vio__input__stream.h Wed Oct 15 03:52:37 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugin_x_src_io_vio__input__stream.h,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/src/io/vio_input_stream.h.orig 2025-09-26 12:55:15.014925544 +0000
++++ plugin/x/src/io/vio_input_stream.h
+@@ -36,7 +36,7 @@ namespace xpl {
+
+ class Vio_input_stream : public google::protobuf::io::ZeroCopyInputStream {
+ public:
+- using gint64 = google::protobuf::int64;
++ using gint64 = int64_t;
+
+ public:
+ explicit Vio_input_stream(const std::shared_ptr<iface::Vio> &connection);
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_src_prepare__param__handler.cc
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_src_prepare__param__handler.cc:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_src_prepare__param__handler.cc Wed Oct 15 03:52:37 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugin_x_src_prepare__param__handler.cc,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/src/prepare_param_handler.cc.orig 2025-09-26 12:59:25.775536085 +0000
++++ plugin/x/src/prepare_param_handler.cc
+@@ -147,8 +147,8 @@ ngs::Error_code Prepare_param_handler::p
+ "' and of type '%s' is not supported for binding"
+ " to prepared statement",
+ ph.m_id,
+- arg.has_scalar() ? arg.scalar().GetTypeName().c_str()
+- : arg.GetTypeName().c_str());
++ arg.has_scalar() ? std::string(arg.scalar().GetTypeName()).c_str()
++ : std::string(arg.GetTypeName()).c_str());
+ }
+ }
+ return ngs::Success();
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_connector_session__holder.cc
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_connector_session__holder.cc:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_connector_session__holder.cc Wed Oct 15 03:52:37 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-plugin_x_tests_driver_connector_session__holder.cc,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/tests/driver/connector/session_holder.cc.orig 2025-09-26 15:16:29.800399712 +0000
++++ plugin/x/tests/driver/connector/session_holder.cc
+@@ -358,7 +358,7 @@ xcl::Handler_result Session_holder::coun
+ Mysqlx::ServerMessages::descriptor()->full_name();
+ const bool is_empty_message = (protobuf_message_name == server_message_name);
+ const std::string &msg_name = !is_empty_message
+- ? msg.GetDescriptor()->full_name()
++ ? std::string(msg.GetDescriptor()->full_name())
+ : server_msgs_by_id[msg_id].second;
+
+ ++m_received_msg_counters[msg_name];
+@@ -367,11 +367,11 @@ xcl::Handler_result Session_holder::coun
+ return xcl::Handler_result::Continue;
+
+ static const std::array<std::string, 5> k_notice_type_id = {
+- Mysqlx::Notice::Warning::descriptor()->full_name(),
+- Mysqlx::Notice::SessionVariableChanged::descriptor()->full_name(),
+- Mysqlx::Notice::SessionStateChanged::descriptor()->full_name(),
+- Mysqlx::Notice::GroupReplicationStateChanged::descriptor()->full_name(),
+- Mysqlx::Notice::ServerHello::descriptor()->full_name(),
++ std::string(Mysqlx::Notice::Warning::descriptor()->full_name()),
++ std::string(Mysqlx::Notice::SessionVariableChanged::descriptor()->full_name()),
++ std::string(Mysqlx::Notice::SessionStateChanged::descriptor()->full_name()),
++ std::string(Mysqlx::Notice::GroupReplicationStateChanged::descriptor()->full_name()),
++ std::string(Mysqlx::Notice::ServerHello::descriptor()->full_name()),
+ };
+
+ const auto notice_type =
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_formatters_message__formatter.cc
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_formatters_message__formatter.cc:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_formatters_message__formatter.cc Wed Oct 15 03:52:37 2025
@@ -0,0 +1,58 @@
+$NetBSD: patch-plugin_x_tests_driver_formatters_message__formatter.cc,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/tests/driver/formatters/message_formatter.cc.orig 2025-09-26 15:19:35.788614740 +0000
++++ plugin/x/tests/driver/formatters/message_formatter.cc
+@@ -176,7 +176,7 @@ static std::string message_to_text(const
+ message.ParseFromString(binary_message);
+ google::protobuf::TextFormat::PrintToString(message, &result);
+
+- return message.GetDescriptor()->full_name() + " { " + result + " }";
++ return std::string(message.GetDescriptor()->full_name()) + " { " + result + " }";
+ }
+
+ static std::string messages_field_to_text(const Message &message,
+@@ -206,7 +206,7 @@ static std::string messages_field_to_tex
+ return xpl::to_string(reflection->GetBool(message, fd));
+
+ case FieldDescriptor::CPPTYPE_ENUM:
+- return reflection->GetEnum(message, fd)->name();
++ return std::string(reflection->GetEnum(message, fd)->name());
+
+ case FieldDescriptor::CPPTYPE_STRING:
+ return reflection->GetString(message, fd);
+@@ -247,7 +247,7 @@ static std::string messages_repeated_fie
+ return xpl::to_string(reflection->GetRepeatedBool(message, fd, index));
+
+ case FieldDescriptor::CPPTYPE_ENUM:
+- return reflection->GetRepeatedEnum(message, fd, index)->name();
++ return std::string(reflection->GetRepeatedEnum(message, fd, index)->name());
+
+ case FieldDescriptor::CPPTYPE_STRING:
+ return reflection->GetRepeatedString(message, fd, index);
+@@ -313,7 +313,7 @@ std::string message_to_text(const Messag
+ printer.PrintToString(message, &output);
+ }
+
+- return message.GetDescriptor()->full_name() + " {\n" + output + "}\n";
++ return std::string(message.GetDescriptor()->full_name()) + " {\n" + output + "}\n";
+ }
+
+ /**
+@@ -348,7 +348,7 @@ std::string message_to_text(const Messag
+ std::find_if(output.begin(), output.end(), expected_field);
+
+ if (output.end() == i) {
+- throw std::logic_error("Message '" + msg->GetDescriptor()->full_name() +
++ throw std::logic_error("Message '" + std::string(msg->GetDescriptor()->full_name()) +
+ "' doesn't contains field '" +
+ expected_field.m_name +
+ "'"
+@@ -405,7 +405,7 @@ std::string message_to_text(const Messag
+ std::string prefix = "";
+
+ if (show_message_name)
+- prefix = message.GetDescriptor()->full_name() + "(" + field_path + ") = ";
++ prefix = std::string(message.GetDescriptor()->full_name()) + "(" + field_path + ") = ";
+
+ if (!field_descriptor->is_repeated())
+ return prefix + messages_field_to_text(*msg, field_descriptor);
Index: pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_processor_send__message__block__processor.cc
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_processor_send__message__block__processor.cc:1.1
--- /dev/null Wed Oct 15 03:52:38 2025
+++ pkgsrc/databases/mysql80-client/patches/patch-plugin_x_tests_driver_processor_send__message__block__processor.cc Wed Oct 15 03:52:37 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugin_x_tests_driver_processor_send__message__block__processor.cc,v 1.1 2025/10/15 03:52:37 jnemeth Exp $
+
+--- plugin/x/tests/driver/processor/send_message_block_processor.cc.orig 2025-09-26 15:25:21.172316733 +0000
++++ plugin/x/tests/driver/processor/send_message_block_processor.cc
+@@ -160,7 +160,7 @@ std::string Send_message_block_processor
+ #endif
+
+ res[4] = client_msgs_by_name
+- [client_msgs_by_full_name[message.GetDescriptor()->full_name()]]
++ [client_msgs_by_full_name[std::string(message.GetDescriptor()->full_name())]]
+ .second;
+ res.append(out);
+
Home |
Main Index |
Thread Index |
Old Index