diff --git a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h index 496899ec87deed0478a8057ed459831eb34047ed..a06d8b4f1ee99303588581a24a92408cd319ef32 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 a2f8c3cee6b630404469a11951e49fada0d8fa9d..28ce251caba878a6da8adaad09507796ef386e64 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()); }