From 6bffe9118f7501601a4086980e9010940b55b2f0 Mon Sep 17 00:00:00 2001 From: Mirko Waechter <waechter@kit.edu> Date: Tue, 19 Aug 2014 18:47:38 +0200 Subject: [PATCH] Removed using namespace boost; --- source/RobotAPI/robotstate/SharedRobotServants.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/RobotAPI/robotstate/SharedRobotServants.cpp b/source/RobotAPI/robotstate/SharedRobotServants.cpp index 4d0fbb6e7..8cfcadad2 100644 --- a/source/RobotAPI/robotstate/SharedRobotServants.cpp +++ b/source/RobotAPI/robotstate/SharedRobotServants.cpp @@ -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 ¤t) const Vector3BasePtr SharedRobotNodeServant::getJointTranslationDirection(const Current ¤t) 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 ¤t) 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 -- GitLab