From 51fbe8ad6e2bd4aafc5887f00dbbd944f1e18015 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Mon, 30 Jul 2018 08:54:04 -0500 Subject: [PATCH] Added parens to declare intent and quiet compiler warnings. --- xs/src/libslic3r/SurfaceCollection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xs/src/libslic3r/SurfaceCollection.cpp b/xs/src/libslic3r/SurfaceCollection.cpp index aa8dd3992..601169d00 100644 --- a/xs/src/libslic3r/SurfaceCollection.cpp +++ b/xs/src/libslic3r/SurfaceCollection.cpp @@ -109,7 +109,7 @@ SurfaceCollection::filter_by_type(std::initializer_list types) n |= t; } for (Surfaces::iterator surface = this->surfaces.begin(); surface != this->surfaces.end(); ++surface) { - if (surface->surface_type & n == surface->surface_type) ss.push_back(&*surface); + if ((surface->surface_type & n) == surface->surface_type) ss.push_back(&*surface); } return ss; } @@ -197,7 +197,7 @@ SurfaceCollection::keep_types(const SurfaceType *types, size_t ntypes) for (size_t i = 0; i < ntypes; ++i) n |= types[i]; // form bitmask. // Use stl remove_if to remove - auto ptr = std::remove_if(surfaces.begin(), surfaces.end(),[n] (const Surface& s) { return s.surface_type & n != s.surface_type; }); + auto ptr = std::remove_if(surfaces.begin(), surfaces.end(),[n] (const Surface& s) { return (s.surface_type & n) != s.surface_type; }); surfaces.erase(ptr, surfaces.cend()); }