[ignition-transport] 02/03: Remove merged patch

[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 dfd503d678dd4bfd4fc3e35dd96a07334cfa92ec
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Feb 1 22:45:55 2017 +0000

    Remove merged patch
---
 debian/patches/0002-fix-protobuf3.patch | 41 ---------------------------------
 debian/patches/series                   |  1 -
 2 files changed, 42 deletions(-)

diff --git a/debian/patches/0002-fix-protobuf3.patch b/debian/patches/0002-fix-protobuf3.patch
deleted file mode 100644
index 690d817..0000000
--- a/debian/patches/0002-fix-protobuf3.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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 d44bb82..20621bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-c++11_unconditional
 0003-respect-cmake-c-flags.patch
 0004_use_system_gtest.patch
-0002-fix-protobuf3.patch
 0005-fix-pkgconfig.patch

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