fix ambiguity with C++20

The compilation error was
test_edge_collapse_Polyhedron_3.cpp(309,1): error C2872: 'format': ambiguous symbol
This commit is contained in:
Jane Tournois 2021-08-26 15:57:02 +02:00 committed by Jane Tournois
parent e697702c62
commit ad6969d67a
1 changed files with 5 additions and 5 deletions

View File

@ -306,12 +306,12 @@ public :
virtual void OnCollected(const Profile& aProfile, const boost::optional<FT>& aCost) const
{
TEST_TRACE(str (format("Collecting %1% : cost=%2%") % edge2str(aProfile.v0_v1()) % optfloat2str(aCost)));
TEST_TRACE(str (boost::format("Collecting %1% : cost=%2%") % edge2str(aProfile.v0_v1()) % optfloat2str(aCost)));
}
virtual void OnCollapsing(const Profile& aProfile, const boost::optional<Point>& aP) const
{
TEST_TRACE(str (format("S %1% - Collapsing %2% : placement=%3%") % mStep % edge2str(aProfile.v0_v1()) % optpoint2str(aP)));
TEST_TRACE(str (boost::format("S %1% - Collapsing %2% : placement=%3%") % mStep % edge2str(aProfile.v0_v1()) % optpoint2str(aP)));
//mBefore = create_edge_link(aProfile);
}
@ -323,10 +323,10 @@ public :
{
SurfaceSP lAfter = create_vertex_link(aProfile, aV);
write(mBefore, str(format("%1%.step-%2%-before.off") % mTestCase % mStep));
write(lAfter , str(format("%1%.step-%2%-after.off") % mTestCase % mStep));
write(mBefore, str(boost::format("%1%.step-%2%-before.off") % mTestCase % mStep));
write(lAfter , str(boost::format("%1%.step-%2%-after.off") % mTestCase % mStep));
REPORT_ERROR(str(format("Resulting surface self-intersects after step %1% (%2% edges left)") % mStep % (aProfile.surface().size_of_halfedges() / 2)));
REPORT_ERROR(str(boost::format("Resulting surface self-intersects after step %1% (%2% edges left)") % mStep % (aProfile.surface().size_of_halfedges() / 2)));
}
++mStep;