From 873b194bd32c9f33ca4dec5359f88db9a91bf6e8 Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Sat, 15 Apr 2017 13:27:40 +0200
Subject: [PATCH] fixed shadowed function
---
source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h | 2 +-
.../libraries/core/remoterobot/RemoteRobotNode.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
index 496899ec8..a06d8b4f1 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
@@ -112,7 +112,7 @@ namespace armarx
virtual bool hasChildNode(const std::string& child, bool recursive = false) const;
virtual std::vector<VirtualRobot::RobotNodePtr> getAllParents(VirtualRobot::RobotNodeSetPtr rns);
- virtual VirtualRobot::RobotNodePtr getParent();
+ virtual VirtualRobot::SceneObjectPtr getParent();
inline SharedRobotNodeInterfacePrx getSharedRobotNode()
{
return _node;
diff --git a/source/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp b/source/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp
index a2f8c3cee..28ce251ca 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * @package
- * @author
- * @date
+ * @package
+ * @author
+ * @date
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
@@ -174,7 +174,7 @@ namespace armarx
}
template<class RobotNodeType>
- RobotNodePtr RemoteRobotNode<RobotNodeType>::getParent()
+ SceneObjectPtr RemoteRobotNode<RobotNodeType>::getParent()
{
return this->robot.lock()->getRobotNode(_node->getParent());
}
--
GitLab