[ignition-transport3] 01/01: Update patch following upstream instructions

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Mon Aug 14 16:02:12 UTC 2017


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

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

commit 9926d9bbfcf16f0bdbc0f99846f5ee69c41f07ac
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Aug 14 16:02:01 2017 +0000

    Update patch following upstream instructions
---
 debian/patches/0002-fix-equal-operator-gtest.patch | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0002-fix-equal-operator-gtest.patch b/debian/patches/0002-fix-equal-operator-gtest.patch
index 2867ace..81195cf 100644
--- a/debian/patches/0002-fix-equal-operator-gtest.patch
+++ b/debian/patches/0002-fix-equal-operator-gtest.patch
@@ -3,28 +3,35 @@ Author: Jose Luis Rivero <jrivero at osrfoundation.org>
 Forwarded: https://bitbucket.org/ignitionrobotics/ign-transport/pull-requests/215
 
 diff --git a/include/ignition/transport/Node.hh b/include/ignition/transport/Node.hh
-index 0e7f00e..562e5a5 100644
+index 0e7f00e..1da9304 100644
 --- a/include/ignition/transport/Node.hh
 +++ b/include/ignition/transport/Node.hh
-@@ -93,7 +93,7 @@ namespace ignition
-         /// \brief Allows this class to be evaluated as a boolean.
-         /// \return True if valid
+@@ -95,6 +95,11 @@ namespace ignition
          /// \sa Valid
--        public: operator bool();
-+        public: operator bool() const;
+         public: operator bool();
  
++        /// \brief Allows this class to be evaluated as a boolean (const).
++        /// \return True if valid
++        /// \sa Valid
++        public: operator bool() const;
++
          /// \brief Return true if valid information, such as a non-empty
          /// topic name, is present.
+         /// \return True if this object can be used in Publish() calls.
 diff --git a/src/Node.cc b/src/Node.cc
-index 742e6f9..ebcc5fc 100644
+index 742e6f9..d9ab1b6 100644
 --- a/src/Node.cc
 +++ b/src/Node.cc
-@@ -157,7 +157,7 @@ Node::Publisher::~Publisher()
+@@ -163,6 +163,12 @@ Node::Publisher::operator bool()
  }
  
  //////////////////////////////////////////////////
--Node::Publisher::operator bool()
 +Node::Publisher::operator bool() const
++{
++  return this->Valid();
++}
++
++//////////////////////////////////////////////////
+ bool Node::Publisher::Valid() const
  {
-   return this->Valid();
- }
+   return !this->dataPtr->publisher.Topic().empty();

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



More information about the debian-science-commits mailing list