Verified Commit e004d470 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

urdf: fix potential issues on Windows

parent 94e7d07d
Pipeline #12247 passed with stage
in 170 minutes and 9 seconds
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "pinocchio/parsers/urdf.hpp" #include "pinocchio/parsers/urdf.hpp"
#include "pinocchio/parsers/urdf/utils.hpp" #include "pinocchio/parsers/urdf/utils.hpp"
#include "pinocchio/parsers/urdf/model.hxx"
#include <urdf_model/model.h> #include <urdf_model/model.h>
#include <urdf_parser/urdf_parser.h> #include <urdf_parser/urdf_parser.h>
......
...@@ -378,7 +378,7 @@ namespace pinocchio ...@@ -378,7 +378,7 @@ namespace pinocchio
{ {
details::UrdfVisitorWithRootJoint<Scalar, Options, JointCollectionTpl> visitor (model, root_joint); details::UrdfVisitorWithRootJoint<Scalar, Options, JointCollectionTpl> visitor (model, root_joint);
if (verbose) visitor.log = &std::cout; if (verbose) visitor.log = &std::cout;
parseRootTree(filename, visitor); details::parseRootTree(filename, visitor);
return model; return model;
} }
...@@ -390,7 +390,7 @@ namespace pinocchio ...@@ -390,7 +390,7 @@ namespace pinocchio
{ {
details::UrdfVisitor<Scalar, Options, JointCollectionTpl> visitor (model); details::UrdfVisitor<Scalar, Options, JointCollectionTpl> visitor (model);
if (verbose) visitor.log = &std::cout; if (verbose) visitor.log = &std::cout;
parseRootTree(filename, visitor); details::parseRootTree(filename, visitor);
return model; return model;
} }
...@@ -403,7 +403,7 @@ namespace pinocchio ...@@ -403,7 +403,7 @@ namespace pinocchio
{ {
details::UrdfVisitorWithRootJoint<Scalar, Options, JointCollectionTpl> visitor (model, rootJoint); details::UrdfVisitorWithRootJoint<Scalar, Options, JointCollectionTpl> visitor (model, rootJoint);
if (verbose) visitor.log = &std::cout; if (verbose) visitor.log = &std::cout;
parseRootTreeFromXML(xmlStream, visitor); details::parseRootTreeFromXML(xmlStream, visitor);
return model; return model;
} }
...@@ -415,7 +415,7 @@ namespace pinocchio ...@@ -415,7 +415,7 @@ namespace pinocchio
{ {
details::UrdfVisitor<Scalar, Options, JointCollectionTpl> visitor (model); details::UrdfVisitor<Scalar, Options, JointCollectionTpl> visitor (model);
if (verbose) visitor.log = &std::cout; if (verbose) visitor.log = &std::cout;
parseRootTreeFromXML(xmlStream, visitor); details::parseRootTreeFromXML(xmlStream, visitor);
return model; return model;
} }
...@@ -429,7 +429,7 @@ namespace pinocchio ...@@ -429,7 +429,7 @@ namespace pinocchio
PINOCCHIO_CHECK_INPUT_ARGUMENT(urdfTree != NULL); PINOCCHIO_CHECK_INPUT_ARGUMENT(urdfTree != NULL);
details::UrdfVisitorWithRootJoint<Scalar, Options, JointCollectionTpl> visitor (model, rootJoint); details::UrdfVisitorWithRootJoint<Scalar, Options, JointCollectionTpl> visitor (model, rootJoint);
if (verbose) visitor.log = &std::cout; if (verbose) visitor.log = &std::cout;
parseRootTree(urdfTree.get(), visitor); details::parseRootTree(urdfTree.get(), visitor);
return model; return model;
} }
...@@ -442,7 +442,7 @@ namespace pinocchio ...@@ -442,7 +442,7 @@ namespace pinocchio
PINOCCHIO_CHECK_INPUT_ARGUMENT(urdfTree != NULL); PINOCCHIO_CHECK_INPUT_ARGUMENT(urdfTree != NULL);
details::UrdfVisitor<Scalar, Options, JointCollectionTpl> visitor (model); details::UrdfVisitor<Scalar, Options, JointCollectionTpl> visitor (model);
if (verbose) visitor.log = &std::cout; if (verbose) visitor.log = &std::cout;
parseRootTree(urdfTree.get(), visitor); details::parseRootTree(urdfTree.get(), visitor);
return model; return model;
} }
...@@ -457,7 +457,7 @@ namespace pinocchio ...@@ -457,7 +457,7 @@ namespace pinocchio
PINOCCHIO_CHECK_INPUT_ARGUMENT(urdfTree != NULL); PINOCCHIO_CHECK_INPUT_ARGUMENT(urdfTree != NULL);
details::UrdfVisitorWithRootJoint<Scalar, Options, JointCollectionTpl> visitor (model, rootJoint); details::UrdfVisitorWithRootJoint<Scalar, Options, JointCollectionTpl> visitor (model, rootJoint);
if (verbose) visitor.log = &std::cout; if (verbose) visitor.log = &std::cout;
parseRootTree(urdfTree.get(), visitor); details::parseRootTree(urdfTree.get(), visitor);
return model; return model;
} }
...@@ -470,7 +470,7 @@ namespace pinocchio ...@@ -470,7 +470,7 @@ namespace pinocchio
PINOCCHIO_CHECK_INPUT_ARGUMENT(urdfTree != NULL); PINOCCHIO_CHECK_INPUT_ARGUMENT(urdfTree != NULL);
details::UrdfVisitor<Scalar, Options, JointCollectionTpl> visitor (model); details::UrdfVisitor<Scalar, Options, JointCollectionTpl> visitor (model);
if (verbose) visitor.log = &std::cout; if (verbose) visitor.log = &std::cout;
parseRootTree(urdfTree.get(), visitor); details::parseRootTree(urdfTree.get(), visitor);
return model; return model;
} }
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment