> I think that this one is fine, although it should become > > #if defined (_WIN32) && defined(_MSC_VER)
Yes, this continues to work for me. > Well, given that the idea is eventually to remove this file entirely, > perhaps you'll first see whether this cures the problem: > > - int const tolerance = std::max(0, tol); > + int const tolerance = (std::max)(0, tol); And the suggested change works as well. Thanks Rob