From bba7295edf3b6d818103ef41c47daefdff73f44b Mon Sep 17 00:00:00 2001 From: aothms Date: Fri, 3 Apr 2020 14:56:46 +0000 Subject: [PATCH] Small fixes for gcc --- nix/build-all.py | 4 +++- src/ifcconvert/validate_wall_connectivity.cpp | 2 +- src/ifcconvert/validation_utils.h | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nix/build-all.py b/nix/build-all.py index 65f990424e..bfeb0005a7 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -748,7 +748,8 @@ if "cgal" in targets: "-DGMP_INCLUDE_DIR=" "{DEPS_DIR}/install/gmp-{GMP_VERSION}/include".format(**locals()), "-DGMP_LIBRARY_DIR=" "{DEPS_DIR}/install/gmp-{GMP_VERSION}/lib".format(**locals()), "-DMPFR_INCLUDE_DIR=" "{DEPS_DIR}/install/mpfr-{MPFR_VERSION}/include".format(**locals()), - "-DMPFR_LIBRARY_DIR=" "{DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib".format(**locals()) + "-DMPFR_LIBRARY_DIR=" "{DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib".format(**locals()), + "-DUSE_CGAL=ON" ]) if "OpenCOLLADA" in targets: @@ -807,6 +808,7 @@ if "IfcOpenShell-Python" in targets: "-DPYTHON_LIBRARY=" +PYTHON_LIBRARY, "-DPYTHON_EXECUTABLE=" +PYTHON_EXECUTABLE, "-DPYTHON_INCLUDE_DIR=" +PYTHON_INCLUDE, + "-DUSE_CGAL=ON", "-DEIGEN_DIR=" "{DEPS_DIR}/install/Eigen-3.3.7".format(**locals()), "-DSWIG_EXECUTABLE=" "{DEPS_DIR}/install/swig/bin/swig".format(**locals()), "-DCMAKE_INSTALL_PREFIX=" "{DEPS_DIR}/install/ifcopenshell/tmp".format(**locals()), diff --git a/src/ifcconvert/validate_wall_connectivity.cpp b/src/ifcconvert/validate_wall_connectivity.cpp index 6429da02c3..a80360c266 100644 --- a/src/ifcconvert/validate_wall_connectivity.cpp +++ b/src/ifcconvert/validate_wall_connectivity.cpp @@ -135,7 +135,7 @@ void fix_wallconnectivity(IfcParse::IfcFile& f, bool no_progress, bool quiet, bo std::vector parameters; - std::transform(vertices(x_poly).begin(), vertices(x_poly).end(), std::back_inserter(parameters), [&P0, D](auto& v) { + std::transform(vertices(x_poly).begin(), vertices(x_poly).end(), std::back_inserter(parameters), [&P0, D](cgal_vertex_descriptor_t& v) { return (v->point() - P0) * D; }); diff --git a/src/ifcconvert/validation_utils.h b/src/ifcconvert/validation_utils.h index eb6e138d38..bc33063eb2 100644 --- a/src/ifcconvert/validation_utils.h +++ b/src/ifcconvert/validation_utils.h @@ -15,8 +15,8 @@ template T enlarge(const T& t, double d = 1.e-5) { - T::NT min[3]; - T::NT max[3]; + typename T::NT min[3]; + typename T::NT max[3]; for (int i = 0; i < t.dimension(); ++i) { min[i] = t.min_coord(i) - d; max[i] = t.max_coord(i) + d;