Andrew Yarmola's compilation fix for MacOSX.
--- a/examples/consistency/rips-consistency-zigzag.cpp Mon Feb 22 17:24:02 2010 -0800
+++ b/examples/consistency/rips-consistency-zigzag.cpp Tue Feb 23 17:39:15 2010 -0800
@@ -215,12 +215,12 @@
std::sort(across.begin(), across.end(), Smplx::VertexDimensionComparison());
rInfo(" Cross simplices size: %d", across.size());
- for (SimplexVector::const_reverse_iterator cur = across.rbegin(); cur != across.rend(); ++cur)
+ for (SimplexVector::const_reverse_iterator cur = across.rbegin(); cur != (SimplexVector::const_reverse_iterator)across.rend(); ++cur)
remove_simplex(*cur, BirthInfo(cur->dimension() - 1, i+1), BirthInfo(cur->dimension(), i, true),
complex, zz, out, remove, skeleton_dimension);
rInfo(" Cross simplices removed");
- for (SimplexVector::const_reverse_iterator cur = subcomplex.rbegin(); cur != subcomplex.rend(); ++cur)
+ for (SimplexVector::const_reverse_iterator cur = subcomplex.rbegin(); cur != (SimplexVector::const_reverse_iterator)subcomplex.rend(); ++cur)
remove_simplex(*cur, BirthInfo(cur->dimension() - 1, i+1), BirthInfo(cur->dimension(), i, true),
complex, zz, out, remove, skeleton_dimension);
rInfo(" Subcomplex simplices removed");
--- a/examples/rips/rips-image-zigzag.cpp Mon Feb 22 17:24:02 2010 -0800
+++ b/examples/rips/rips-image-zigzag.cpp Tue Feb 23 17:39:15 2010 -0800
@@ -218,7 +218,7 @@
rDebug(" Recorded cofaces to remove");
rDebug(" Cofaces size: %d", cofaces.size());
// Remove all the cofaces
- for (SimplexSet::const_reverse_iterator cur = cofaces.rbegin(); cur != cofaces.rend(); ++cur)
+ for (SimplexSet::const_reverse_iterator cur = cofaces.rbegin(); cur != (SimplexSet::const_reverse_iterator)cofaces.rend(); ++cur)
{
rDebug(" Removing %s", tostring(*cur).c_str());
Complex::iterator si = complex.find(*cur);
@@ -306,7 +306,7 @@
vertices.begin() + i + 1);
vc.stop();
rDebug(" Computed cofaces of the vertex, their number: %d", cofaces.size());
- for (SimplexSet::const_reverse_iterator cur = cofaces.rbegin(); cur != cofaces.rend(); ++cur)
+ for (SimplexSet::const_reverse_iterator cur = cofaces.rbegin(); cur != (SimplexSet::const_reverse_iterator)cofaces.rend(); ++cur)
{
rDebug(" Removing: %s", tostring(*cur).c_str());
Complex::iterator si = complex.find(*cur);
--- a/examples/rips/rips-zigzag.cpp Mon Feb 22 17:24:02 2010 -0800
+++ b/examples/rips/rips-zigzag.cpp Tue Feb 23 17:39:15 2010 -0800
@@ -232,7 +232,7 @@
vertices.begin() + i + 1);
vc.stop();
rDebug(" Computed cofaces of the vertex, their number: %d", cofaces.size());
- for (SimplexSet::const_reverse_iterator cur = cofaces.rbegin(); cur != cofaces.rend(); ++cur)
+ for (SimplexSet::const_reverse_iterator cur = cofaces.rbegin(); cur != (SimplexSet::const_reverse_iterator)cofaces.rend(); ++cur)
{
rDebug(" Removing: %s", tostring(*cur).c_str());
Complex::iterator si = complex.find(*cur);