Skip to content
Snippets Groups Projects
Commit 873b194b authored by Mirko Wächter's avatar Mirko Wächter
Browse files

fixed shadowed function

parent 475aad43
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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());
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment