Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Leander Singer
RobotAPI
Commits
6bffe911
Commit
6bffe911
authored
10 years ago
by
Mirko Waechter
Browse files
Options
Downloads
Patches
Plain Diff
Removed using namespace boost;
parent
42b9fd68
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/robotstate/SharedRobotServants.cpp
+5
-5
5 additions, 5 deletions
source/RobotAPI/robotstate/SharedRobotServants.cpp
with
5 additions
and
5 deletions
source/RobotAPI/robotstate/SharedRobotServants.cpp
+
5
−
5
View file @
6bffe911
...
...
@@ -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
&
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment