Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring

This commit is contained in:
Enrico Turri 2019-03-18 11:31:19 +01:00
commit 0453d818f5

View file

@ -758,7 +758,7 @@ public:
template<class T> inline const Pillar& pillar(T id) const {
static_assert(std::is_integral<T>::value, "Invalid index type");
assert(id >= 0 && id < m_pillars.size() &&
id < std::numerix_limits<size_t>::max());
id < std::numeric_limits<size_t>::max());
return m_pillars[size_t(id)];
}