Commit 02a8338b authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Merge pull request #8 from billx09/stable

Move operator<< for Joint and Device into namespace hpp::model
parents 23cf9c96 cb0f1ffd
...@@ -358,9 +358,9 @@ namespace hpp { ...@@ -358,9 +358,9 @@ namespace hpp {
ExtraConfigSpace extraConfigSpace_; ExtraConfigSpace extraConfigSpace_;
DeviceWkPtr_t weakPtr_; DeviceWkPtr_t weakPtr_;
}; // class Device }; // class Device
std::ostream& operator<< (std::ostream& os, const hpp::model::Device& device);
} // namespace model } // namespace model
} // namespace hpp } // namespace hpp
std::ostream& operator<< (std::ostream& os, const hpp::model::Device& device);
#endif // HPP_MODEL_DEVICE_HH #endif // HPP_MODEL_DEVICE_HH
...@@ -530,11 +530,11 @@ namespace hpp { ...@@ -530,11 +530,11 @@ namespace hpp {
mutable fcl::Vec3f com_; mutable fcl::Vec3f com_;
}; // class JointTranslation }; // class JointTranslation
std::ostream& operator<< (std::ostream& os, const hpp::model::Joint& joint);
} // namespace model } // namespace model
} // namespace hpp } // namespace hpp
namespace fcl { namespace fcl {
std::ostream& operator<< (std::ostream& os , const fcl::Transform3f& trans); std::ostream& operator<< (std::ostream& os , const fcl::Transform3f& trans);
} }
std::ostream& operator<< (std::ostream& os, const hpp::model::Joint& joint);
#endif // HPP_MODEL_JOINT_HH #endif // HPP_MODEL_JOINT_HH
...@@ -570,10 +570,10 @@ namespace hpp { ...@@ -570,10 +570,10 @@ namespace hpp {
return os; return os;
} }
std::ostream& operator<<(std::ostream& os, const hpp::model::Device& device)
{
return device.print (os);
}
} // namespace model } // namespace model
} // namespace hpp } // namespace hpp
std::ostream& operator<<(std::ostream& os, const hpp::model::Device& device)
{
return device.print (os);
}
...@@ -665,6 +665,11 @@ namespace hpp { ...@@ -665,6 +665,11 @@ namespace hpp {
template class JointTranslation <1>; template class JointTranslation <1>;
template class JointTranslation <2>; template class JointTranslation <2>;
template class JointTranslation <3>; template class JointTranslation <3>;
std::ostream& operator<< (std::ostream& os, const hpp::model::Joint& joint)
{
return joint.display (os);
}
} // namespace model } // namespace model
} // namespace hpp } // namespace hpp
...@@ -682,9 +687,3 @@ namespace fcl { ...@@ -682,9 +687,3 @@ namespace fcl {
return os; return os;
} }
} }
std::ostream& operator<< (std::ostream& os, const hpp::model::Joint& joint)
{
return joint.display (os);
}
Supports Markdown
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