+ fix build problems with MSVC and libpack

2015-09-21 00:45:03 +02:00
parent e6d54c6df9
commit e0bdf24c95
10 changed files with 26 additions and 12 deletions
--- a/src/App/Expression.cpp
+++ b/src/App/Expression.cpp
@@ -46,6 +46,7 @@
 #include <App/PropertyUnits.h>
 #include <App/ObjectIdentifier.h>
 #include <boost/math/special_functions/round.hpp>
+#include <boost/math/special_functions/trunc.hpp>

 #ifndef M_PI
 #define M_PI       3.14159265358979323846
@@ -770,10 +771,10 @@ Expression * FunctionExpression::eval() const
        break;
    }
    case ROUND:
-        output = round(value);
+        output = boost::math::round(value);
        break;
    case TRUNC:
-        output = trunc(value);
+        output = boost::math::trunc(value);
        break;
    case CEIL:
        output = ceil(value);