[ignition-transport] 01/01: Fix compilation for protobuf3

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository ignition-transport.

commit af8931f7cc0decd78166d93f00133c0beee71f0a
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Tue Aug 30 23:40:49 2016 +0000

    Fix compilation for protobuf3
---
 debian/patches/0002-fix-protobuf3.patch | 41 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/0002-fix-protobuf3.patch b/debian/patches/0002-fix-protobuf3.patch
new file mode 100644
index 0000000..690d817
--- /dev/null
+++ b/debian/patches/0002-fix-protobuf3.patch
@@ -0,0 +1,41 @@
+Description: update protobuf calls to protobuf3
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Forwarded: No
+
+diff --git a/include/ignition/transport/RepHandler.hh b/include/ignition/transport/RepHandler.hh
+index f374290..29526f1 100644
+--- a/include/ignition/transport/RepHandler.hh
++++ b/include/ignition/transport/RepHandler.hh
+@@ -35,6 +35,8 @@
+ #include "ignition/transport/TransportTypes.hh"
+ #include "ignition/transport/Uuid.hh"
+ 
++#include <google/protobuf/stubs/casts.h>
++
+ namespace ignition
+ {
+   namespace transport
+@@ -121,8 +123,8 @@ namespace ignition
+         // Execute the callback (if existing)
+         if (this->cb)
+         {
+-          auto msgReq = google::protobuf::down_cast<const Req*>(&_msgReq);
+-          auto msgRep = google::protobuf::down_cast<Rep*>(&_msgRep);
++          auto msgReq = google::protobuf::internal::down_cast<const Req*>(&_msgReq);
++          auto msgRep = google::protobuf::internal::down_cast<Rep*>(&_msgRep);
+ 
+           this->cb(*msgReq, *msgRep, _result);
+         }
+diff --git a/include/ignition/transport/SubscriptionHandler.hh b/include/ignition/transport/SubscriptionHandler.hh
+index a7cad19..8507459 100644
+--- a/include/ignition/transport/SubscriptionHandler.hh
++++ b/include/ignition/transport/SubscriptionHandler.hh
+@@ -145,7 +145,7 @@ namespace ignition
+         // Execute the callback (if existing)
+         if (this->cb)
+         {
+-          auto msgPtr = google::protobuf::down_cast<const T*>(&_msg);
++          auto msgPtr = google::protobuf::internal::down_cast<const T*>(&_msg);
+ 
+           this->cb(*msgPtr);
+           return true;
diff --git a/debian/patches/series b/debian/patches/series
index 71969d0..ace37c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-c++11_unconditional
 0003-respect-cmake-c-flags.patch
 0004_use_system_gtest.patch
+0002-fix-protobuf3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ignition-transport.git