Skip to content
Snippets Groups Projects
Commit bfbc0e3d authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Fix throw_ifs where the condition was negated

parent 621937ff
No related branches found
No related tags found
No related merge requests found
......@@ -24,7 +24,7 @@ namespace VirtualRobot
if (!kinematicRoot && robotNodes.size() > 0)
{
THROW_VR_EXCEPTION_IF(rob, "RobotNodeSet::RobotNodeSet: Robot is NULL");
THROW_VR_EXCEPTION_IF(!rob, "RobotNodeSet::RobotNodeSet: Robot is NULL");
this->kinematicRoot = rob->getRootNode();
}
......@@ -35,7 +35,7 @@ namespace VirtualRobot
{
oldRootName = this->kinematicRoot->getName();
}
THROW_VR_EXCEPTION_IF(rob, "RobotNodeSet::RobotNodeSet: Robot is NULL");
THROW_VR_EXCEPTION_IF(!rob, "RobotNodeSet::RobotNodeSet: Robot is NULL");
this->kinematicRoot = rob->getRootNode();
if(this->kinematicRoot)
{
......@@ -415,7 +415,7 @@ namespace VirtualRobot
THROW_VR_EXCEPTION_IF(jointValues.size() != robotNodes.size(), "Wrong vector dimension (robotNodes:" << robotNodes.size() << ", jointValues: " << jointValues.size() << ")" << endl);
RobotPtr rob = robot.lock();
THROW_VR_EXCEPTION_IF(rob, "RobotNodeSet::setJointValues: Robot is NULL (The last shared_ptr was deleted)");
THROW_VR_EXCEPTION_IF(!rob, "RobotNodeSet::setJointValues: Robot is NULL (The last shared_ptr was deleted)");
WriteLockPtr lock = rob->getWriteLock();
for (unsigned int i = 0; i < robotNodes.size(); i++)
......@@ -438,7 +438,7 @@ namespace VirtualRobot
{
THROW_VR_EXCEPTION_IF(static_cast<std::size_t>(jointValues.rows()) != robotNodes.size(), "Wrong vector dimension (robotNodes:" << robotNodes.size() << ", jointValues: " << jointValues.size() << ")" << endl);
RobotPtr rob = robot.lock();
THROW_VR_EXCEPTION_IF(rob, "RobotNodeSet::setJointValues: Robot is NULL (The last shared_ptr was deleted)");
THROW_VR_EXCEPTION_IF(!rob, "RobotNodeSet::setJointValues: Robot is NULL (The last shared_ptr was deleted)");
WriteLockPtr lock = rob->getWriteLock();
for (unsigned int i = 0; i < robotNodes.size(); i++)
......@@ -460,7 +460,7 @@ namespace VirtualRobot
{
VR_ASSERT(jointValues);
RobotPtr rob = robot.lock();
THROW_VR_EXCEPTION_IF(rob, "RobotNodeSet::setJointValues: Robot is NULL (The last shared_ptr was deleted)");
THROW_VR_EXCEPTION_IF(!rob, "RobotNodeSet::setJointValues: Robot is NULL (The last shared_ptr was deleted)");
WriteLockPtr lock = rob->getWriteLock();
for (unsigned int i = 0; i < robotNodes.size(); i++)
......
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