Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
pinocchio
Commits
e004d470
Verified
Commit
e004d470
authored
Nov 16, 2020
by
Justin Carpentier
Browse files
urdf: fix potential issues on Windows
parent
94e7d07d
Pipeline
#12247
passed with stage
in 170 minutes and 9 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/parsers/urdf/model.cpp
View file @
e004d470
...
...
@@ -5,6 +5,7 @@
#include
"pinocchio/parsers/urdf.hpp"
#include
"pinocchio/parsers/urdf/utils.hpp"
#include
"pinocchio/parsers/urdf/model.hxx"
#include
<urdf_model/model.h>
#include
<urdf_parser/urdf_parser.h>
...
...
src/parsers/urdf/model.hxx
View file @
e004d470
...
...
@@ -378,7 +378,7 @@ namespace pinocchio
{
details
::
UrdfVisitorWithRootJoint
<
Scalar
,
Options
,
JointCollectionTpl
>
visitor
(
model
,
root_joint
);
if
(
verbose
)
visitor
.
log
=
&
std
::
cout
;
parseRootTree
(
filename
,
visitor
);
details
::
parseRootTree
(
filename
,
visitor
);
return
model
;
}
...
...
@@ -390,7 +390,7 @@ namespace pinocchio
{
details
::
UrdfVisitor
<
Scalar
,
Options
,
JointCollectionTpl
>
visitor
(
model
);
if
(
verbose
)
visitor
.
log
=
&
std
::
cout
;
parseRootTree
(
filename
,
visitor
);
details
::
parseRootTree
(
filename
,
visitor
);
return
model
;
}
...
...
@@ -403,7 +403,7 @@ namespace pinocchio
{
details
::
UrdfVisitorWithRootJoint
<
Scalar
,
Options
,
JointCollectionTpl
>
visitor
(
model
,
rootJoint
);
if
(
verbose
)
visitor
.
log
=
&
std
::
cout
;
parseRootTreeFromXML
(
xmlStream
,
visitor
);
details
::
parseRootTreeFromXML
(
xmlStream
,
visitor
);
return
model
;
}
...
...
@@ -415,7 +415,7 @@ namespace pinocchio
{
details
::
UrdfVisitor
<
Scalar
,
Options
,
JointCollectionTpl
>
visitor
(
model
);
if
(
verbose
)
visitor
.
log
=
&
std
::
cout
;
parseRootTreeFromXML
(
xmlStream
,
visitor
);
details
::
parseRootTreeFromXML
(
xmlStream
,
visitor
);
return
model
;
}
...
...
@@ -429,7 +429,7 @@ namespace pinocchio
PINOCCHIO_CHECK_INPUT_ARGUMENT
(
urdfTree
!=
NULL
);
details
::
UrdfVisitorWithRootJoint
<
Scalar
,
Options
,
JointCollectionTpl
>
visitor
(
model
,
rootJoint
);
if
(
verbose
)
visitor
.
log
=
&
std
::
cout
;
parseRootTree
(
urdfTree
.
get
(),
visitor
);
details
::
parseRootTree
(
urdfTree
.
get
(),
visitor
);
return
model
;
}
...
...
@@ -442,7 +442,7 @@ namespace pinocchio
PINOCCHIO_CHECK_INPUT_ARGUMENT
(
urdfTree
!=
NULL
);
details
::
UrdfVisitor
<
Scalar
,
Options
,
JointCollectionTpl
>
visitor
(
model
);
if
(
verbose
)
visitor
.
log
=
&
std
::
cout
;
parseRootTree
(
urdfTree
.
get
(),
visitor
);
details
::
parseRootTree
(
urdfTree
.
get
(),
visitor
);
return
model
;
}
...
...
@@ -457,7 +457,7 @@ namespace pinocchio
PINOCCHIO_CHECK_INPUT_ARGUMENT
(
urdfTree
!=
NULL
);
details
::
UrdfVisitorWithRootJoint
<
Scalar
,
Options
,
JointCollectionTpl
>
visitor
(
model
,
rootJoint
);
if
(
verbose
)
visitor
.
log
=
&
std
::
cout
;
parseRootTree
(
urdfTree
.
get
(),
visitor
);
details
::
parseRootTree
(
urdfTree
.
get
(),
visitor
);
return
model
;
}
...
...
@@ -470,7 +470,7 @@ namespace pinocchio
PINOCCHIO_CHECK_INPUT_ARGUMENT
(
urdfTree
!=
NULL
);
details
::
UrdfVisitor
<
Scalar
,
Options
,
JointCollectionTpl
>
visitor
(
model
);
if
(
verbose
)
visitor
.
log
=
&
std
::
cout
;
parseRootTree
(
urdfTree
.
get
(),
visitor
);
details
::
parseRootTree
(
urdfTree
.
get
(),
visitor
);
return
model
;
}
#endif
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment