Attachment 175642 Details for Bug 212973 – patch to make ostinato work with protobuf 3.1.0

[patch] patch to make ostinato work with protobuf 3.1.0

ostinato-0.8.diff (text/plain), 1.91 KB, created by E.J. Bevenour on 2016-10-12 01:11:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: E.J. Bevenour

Created: 2016-10-12 01:11:03 UTC

Size: 1.91 KB

patch

obsolete

>Index: files/patch-client_portgroup.cpp
>===================================================================
>--- files/patch-client_portgroup.cpp	(nonexistent)
>+++ files/patch-client_portgroup.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- client/portgroup.cpp.orig	2016-10-11 20:45:15 UTC
>++++ client/portgroup.cpp
>+@@ -36,7 +36,7 @@ along with this program.  If not, see <h
>+ #include <QtGlobal>
>+ #include <QUrl>
>+ 
>+-using ::google::protobuf::NewCallback;
>++using ::google::protobuf::internal::NewCallback;
>+ 
>+ extern QMainWindow *mainWindow;
>+ extern char *version;
>
>Property changes on: files/patch-client_portgroup.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-rpc_rpcconn.cpp
>===================================================================
>--- files/patch-rpc_rpcconn.cpp	(nonexistent)
>+++ files/patch-rpc_rpcconn.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- rpc/rpcconn.cpp.orig	2016-06-27 11:54:52 UTC
>++++ rpc/rpcconn.cpp
>+@@ -379,7 +379,7 @@ void RpcConnection::on_clientSock_dataAv
>+     //qDebug("before service->callmethod()");
>+ 
>+     service->CallMethod(methodDesc, controller, req, resp,
>+-        google::protobuf::NewCallback(this, &RpcConnection::sendRpcReply, 
>++        google::protobuf::internal::NewCallback(this, &RpcConnection::sendRpcReply, 
>+                                       controller));
>+ 
>+     return;
>
>Property changes on: files/patch-rpc_rpcconn.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 212973: 175138 | 175642 | 175672