3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed functions declaration template<class Tf> inline constexpr coord_t scaled(Tf val) and template<class Tf> inline constexpr Tf unscaled(coord_t val) to use constexpr on versions of Visual Studio which support it

Browse source
This commit is contained in:
Enrico Turri 2019-06-17 09:28:41 +02:00
parent c5037540e9
commit 9ffd294f07
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libslic3r/libslic3r.h
View file

@ -49,13 +49,21 @@ typedef double coordf_t;
//inline coord_t scale_(coordf_t v) { return coord_t(floor(v / SCALING_FACTOR + 0.5f)); } //inline coord_t scale_(coordf_t v) { return coord_t(floor(v / SCALING_FACTOR + 0.5f)); }
#define scale_(val) ((val) / SCALING_FACTOR) #define scale_(val) ((val) / SCALING_FACTOR)
#if defined(_MSC_VER) && (_MSC_VER < 1910)
template<class Tf> inline coord_t scaled(Tf val)
#else
template<class Tf> inline constexpr coord_t scaled(Tf val) template<class Tf> inline constexpr coord_t scaled(Tf val)
#endif // _MSC_VER
{ {
static_assert (std::is_floating_point<Tf>::value, "Floating point only"); static_assert (std::is_floating_point<Tf>::value, "Floating point only");
return coord_t(val / Tf(SCALING_FACTOR)); return coord_t(val / Tf(SCALING_FACTOR));
} }
#if defined(_MSC_VER) && (_MSC_VER < 1910)
template<class Tf> inline Tf unscaled(coord_t val)
#else
template<class Tf> inline constexpr Tf unscaled(coord_t val) template<class Tf> inline constexpr Tf unscaled(coord_t val)
#endif // _MSC_VER
{ {
static_assert (std::is_floating_point<Tf>::value, "Floating point only"); static_assert (std::is_floating_point<Tf>::value, "Floating point only");
return Tf(val * Tf(SCALING_FACTOR)); return Tf(val * Tf(SCALING_FACTOR));