GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 02:55:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed calling convention to get gcc49 to not mis-parse as an initializer list

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-27 08:27:16 -05:00
parent d11f623ca5
commit 5b06201e18
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xs/src/libslic3r/SurfaceCollection.cpp
View File

@ -186,7 +186,7 @@ void
SurfaceCollection::keep_type(const SurfaceType type) SurfaceCollection::keep_type(const SurfaceType type)
{ {
// Use stl remove_if to remove // Use stl remove_if to remove
auto ptr {std::remove_if(surfaces.begin(), surfaces.end(),[type] (const Surface& s) { return s.surface_type != type; })}; auto ptr = std::remove_if(surfaces.begin(), surfaces.end(),[type] (const Surface& s) { return s.surface_type != type; });
surfaces.erase(ptr, surfaces.cend()); surfaces.erase(ptr, surfaces.cend());
} }
@ -197,7 +197,7 @@ SurfaceCollection::keep_types(const SurfaceType *types, size_t ntypes)
for (size_t i = 0; i < ntypes; ++i) for (size_t i = 0; i < ntypes; ++i)
n |= types[i]; // form bitmask. n |= types[i]; // form bitmask.
// Use stl remove_if to remove // 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()); surfaces.erase(ptr, surfaces.cend());
} }