From e75fe0d6e3e62b6fd7661d953d0e8c910584cd7c Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 31 Oct 2016 21:31:35 +0100 Subject: [PATCH] fix compiler warning --- src/3rdParty/salomesmesh/CMakeLists.txt | 2 +- src/Mod/MeshPart/App/AppMeshPartPy.cpp | 6 +++--- src/Mod/Points/App/Points.cpp | 5 ++++- src/Mod/Points/App/Points.h | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt index 7a24b548d..8e682fb2e 100644 --- a/src/3rdParty/salomesmesh/CMakeLists.txt +++ b/src/3rdParty/salomesmesh/CMakeLists.txt @@ -143,7 +143,7 @@ ELSE(UNIX) ######### Windows ########### #MESSAGE("-- Windows system detected") IF(MSVC) - ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4806 /wd4275 /wd4005 /wd4099 /wd4101 /wd4267 /wd4390 /wd4503 /wd4436) + ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4805 /wd4806 /wd4275 /wd4005 /wd4099 /wd4101 /wd4146 /wd4267 /wd4390 /wd4503 /wd4436) ELSE(MSVC) ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB) ENDIF(MSVC) diff --git a/src/Mod/MeshPart/App/AppMeshPartPy.cpp b/src/Mod/MeshPart/App/AppMeshPartPy.cpp index 12ecec6b0..a25ab1793 100644 --- a/src/Mod/MeshPart/App/AppMeshPartPy.cpp +++ b/src/Mod/MeshPart/App/AppMeshPartPy.cpp @@ -202,9 +202,9 @@ private: Py::Float r(t[0]); Py::Float g(t[1]); Py::Float b(t[2]); - App::Color c(static_cast(r), - static_cast(g), - static_cast(b)); + App::Color c(static_cast(r), + static_cast(g), + static_cast(b)); colors.push_back(c.getPackedValue()); } mesher.setColors(colors); diff --git a/src/Mod/Points/App/Points.cpp b/src/Mod/Points/App/Points.cpp index 358035280..27eb44b71 100644 --- a/src/Mod/Points/App/Points.cpp +++ b/src/Mod/Points/App/Points.cpp @@ -119,7 +119,10 @@ std::vector PointKernel::getValidPoints() const if (!(boost::math::isnan(it->x) || boost::math::isnan(it->y) || boost::math::isnan(it->z))) - valid.push_back(value_type(it->x, it->y, it->z)); + valid.push_back(value_type( + static_cast(it->x), + static_cast(it->y), + static_cast(it->z))); } return valid; } diff --git a/src/Mod/Points/App/Points.h b/src/Mod/Points/App/Points.h index 8b058feed..6dda11bd1 100644 --- a/src/Mod/Points/App/Points.h +++ b/src/Mod/Points/App/Points.h @@ -46,7 +46,8 @@ class PointsExport PointKernel : public Data::ComplexGeoData TYPESYSTEM_HEADER(); public: - typedef Base::Vector3f value_type; + typedef float float_type; + typedef Base::Vector3 value_type; typedef std::vector::difference_type difference_type; typedef std::vector::size_type size_type;