Skip to content
Snippets Groups Projects
Commit 6bffe911 authored by Mirko Waechter's avatar Mirko Waechter
Browse files

Removed using namespace boost;

parent 42b9fd68
No related branches found
No related tags found
No related merge requests found
......@@ -15,7 +15,7 @@ using namespace std;
using namespace VirtualRobot;
using namespace Eigen;
using namespace Ice;
using namespace boost;
#undef VERBOSE
......@@ -42,7 +42,7 @@ SharedObjectBase::SharedObjectBase()
void SharedObjectBase::ref(const Current &c)
{
lock_guard<mutex> lock(this->_counterMutex);
boost::lock_guard<boost::mutex> lock(this->_counterMutex);
_referenceCount++;
#ifdef VERBOSE
......@@ -52,7 +52,7 @@ void SharedObjectBase::ref(const Current &c)
void SharedObjectBase::unref(const Current &c)
{
lock_guard<mutex> lock(this->_counterMutex);
boost::lock_guard<boost::mutex> lock(this->_counterMutex);
#ifdef VERBOSE
ARMARX_LOG_S << "unref: " << _referenceCount << " " << this << flush;
......@@ -141,7 +141,7 @@ JointType SharedRobotNodeServant::getType(const Current &current) const
Vector3BasePtr SharedRobotNodeServant::getJointTranslationDirection(const Current &current) const
{
ReadLockPtr lock = _node->getRobot()->getReadLock();
shared_ptr<RobotNodePrismatic> prismatic = dynamic_pointer_cast<RobotNodePrismatic>(_node);
boost::shared_ptr<RobotNodePrismatic> prismatic = dynamic_pointer_cast<RobotNodePrismatic>(_node);
if (prismatic)
return new Vector3(prismatic->getJointTranslationDirection());
else
......@@ -151,7 +151,7 @@ Vector3BasePtr SharedRobotNodeServant::getJointTranslationDirection(const Curren
Vector3BasePtr SharedRobotNodeServant::getJointRotationAxis(const Current &current) const
{
ReadLockPtr lock = _node->getRobot()->getReadLock();
shared_ptr<RobotNodeRevolute> revolute = dynamic_pointer_cast<RobotNodeRevolute>(_node);
boost::shared_ptr<RobotNodeRevolute> revolute = dynamic_pointer_cast<RobotNodeRevolute>(_node);
if (revolute)
return new Vector3(revolute->getJointRotationAxis());
else
......
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