diff --git a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp index bd01c08bf..b22b28905 100644 --- a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp +++ b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp @@ -160,7 +160,7 @@ Driver_Mesh::Status DriverSTL_R_SMDS_Mesh::Perform() static Standard_Real readFloat(OSD_File& theFile) { union { - Standard_Boolean i; + Standard_Integer i; Standard_ShortReal f; }u; diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp index fdbd6d5d3..b647d95fd 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp @@ -54,6 +54,10 @@ #include // Netgen include files +#ifdef _MSC_VER +#pragma warning(disable : 4067) +#endif + namespace nglib { #include } diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp index 98c486cca..fbf10f0b6 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp @@ -50,6 +50,10 @@ /* Netgen include files */ +#ifdef _MSC_VER +#pragma warning(disable : 4067) +#endif + namespace nglib { #include } diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp index de80ede30..3e5ad7408 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp @@ -59,6 +59,9 @@ /* Netgen include files */ +#ifdef _MSC_VER +#pragma warning(disable : 4067) +#endif namespace nglib { #include diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp index 104a2de04..d6291040a 100644 --- a/src/App/Expression.cpp +++ b/src/App/Expression.cpp @@ -63,6 +63,8 @@ #if defined(_MSC_VER) #define strtoll _strtoi64 +#pragma warning(disable : 4003) +#pragma warning(disable : 4065) #endif using namespace Base; diff --git a/src/Gui/Quarter/InputDevice.cpp b/src/Gui/Quarter/InputDevice.cpp index 6a074d1cc..d7562a0d6 100644 --- a/src/Gui/Quarter/InputDevice.cpp +++ b/src/Gui/Quarter/InputDevice.cpp @@ -30,6 +30,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ +#ifdef _MSC_VER +#pragma warning(disable : 4267) +#endif + #include #include #include diff --git a/src/Gui/Quarter/Keyboard.cpp b/src/Gui/Quarter/Keyboard.cpp index f6b6f1a27..49ebc987a 100644 --- a/src/Gui/Quarter/Keyboard.cpp +++ b/src/Gui/Quarter/Keyboard.cpp @@ -38,6 +38,10 @@ */ +#ifdef _MSC_VER +#pragma warning(disable : 4267) +#endif + #include #include diff --git a/src/Gui/Quarter/Mouse.cpp b/src/Gui/Quarter/Mouse.cpp index b77b494be..e61673d92 100644 --- a/src/Gui/Quarter/Mouse.cpp +++ b/src/Gui/Quarter/Mouse.cpp @@ -37,6 +37,10 @@ QuarterWidget. */ +#ifdef _MSC_VER +#pragma warning(disable : 4267) +#endif + #include #include diff --git a/src/Gui/Quarter/QuarterWidget.cpp b/src/Gui/Quarter/QuarterWidget.cpp index 9e618027f..6532cc64f 100644 --- a/src/Gui/Quarter/QuarterWidget.cpp +++ b/src/Gui/Quarter/QuarterWidget.cpp @@ -48,6 +48,10 @@ \endcode */ +#ifdef _MSC_VER +#pragma warning(disable : 4267) +#endif + #include #include diff --git a/src/Gui/Quarter/QuarterWidgetP.cpp b/src/Gui/Quarter/QuarterWidgetP.cpp index 36685a909..45f328ceb 100644 --- a/src/Gui/Quarter/QuarterWidgetP.cpp +++ b/src/Gui/Quarter/QuarterWidgetP.cpp @@ -34,6 +34,10 @@ #include #include +#ifdef _MSC_VER +#pragma warning(disable : 4267) +#endif + #include #include #include diff --git a/src/Gui/Quarter/SpaceNavigatorDevice.cpp b/src/Gui/Quarter/SpaceNavigatorDevice.cpp index e207ba503..b6c2d29fe 100644 --- a/src/Gui/Quarter/SpaceNavigatorDevice.cpp +++ b/src/Gui/Quarter/SpaceNavigatorDevice.cpp @@ -30,6 +30,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ +#ifdef _MSC_VER +#pragma warning(disable : 4267) +#endif + #include #include diff --git a/src/Mod/Path/libarea/PythonStuff.cpp b/src/Mod/Path/libarea/PythonStuff.cpp index 42d40e3cf..9029dc6e1 100644 --- a/src/Mod/Path/libarea/PythonStuff.cpp +++ b/src/Mod/Path/libarea/PythonStuff.cpp @@ -51,6 +51,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef __GNUG__ #pragma implementation #endif +#ifdef _MSC_VER +#pragma warning(disable : 4244) +#endif #include #include diff --git a/src/Mod/Points/App/PreCompiled.h b/src/Mod/Points/App/PreCompiled.h index e4a6109a2..827c0d986 100644 --- a/src/Mod/Points/App/PreCompiled.h +++ b/src/Mod/Points/App/PreCompiled.h @@ -30,19 +30,17 @@ #ifdef FC_OS_WIN32 # define PointsExport __declspec(dllexport) #else // for Linux -# define PointsExport +# define PointsExport #endif -#ifdef _PreComp_ - // here get the warnings of too long specifiers disabled (needed for VC6) #ifdef _MSC_VER -# pragma warning( disable : 4251 ) -# pragma warning( disable : 4503 ) -# pragma warning( disable : 4275 ) -# pragma warning( disable : 4786 ) // specifier longer then 255 chars +# pragma warning( disable : 4181 ) +# pragma warning( disable : 4305 ) #endif +#ifdef _PreComp_ + // standard #include #include diff --git a/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_HH.cpp b/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_HH.cpp index 36da50914..35349039f 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_HH.cpp +++ b/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_HH.cpp @@ -19,6 +19,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#ifdef _MSC_VER +#pragma warning(disable : 4244) +#pragma warning(disable : 4800) +#endif + #include "svd_eigen_HH.hpp" namespace KDL{ diff --git a/src/Mod/Sketcher/App/planegcs/GCS.cpp b/src/Mod/Sketcher/App/planegcs/GCS.cpp index 7de4aeda2..4cc104ed7 100644 --- a/src/Mod/Sketcher/App/planegcs/GCS.cpp +++ b/src/Mod/Sketcher/App/planegcs/GCS.cpp @@ -19,6 +19,11 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ + +#ifdef _MSC_VER +#pragma warning(disable : 4244) +#endif + #include #include #include diff --git a/src/Mod/Sketcher/App/planegcs/qp_eq.cpp b/src/Mod/Sketcher/App/planegcs/qp_eq.cpp index d2c63ee75..42619750a 100644 --- a/src/Mod/Sketcher/App/planegcs/qp_eq.cpp +++ b/src/Mod/Sketcher/App/planegcs/qp_eq.cpp @@ -19,6 +19,11 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ***************************************************************************/ + +#ifdef _MSC_VER +#pragma warning(disable : 4244) +#endif + #include #include diff --git a/src/Mod/Spreadsheet/App/SpreadsheetExpression.cpp b/src/Mod/Spreadsheet/App/SpreadsheetExpression.cpp index b69a2c86d..807ed22d2 100644 --- a/src/Mod/Spreadsheet/App/SpreadsheetExpression.cpp +++ b/src/Mod/Spreadsheet/App/SpreadsheetExpression.cpp @@ -62,6 +62,8 @@ #if defined(_MSC_VER) #define strtoll _strtoi64 +#pragma warning(disable : 4003) +#pragma warning(disable : 4065) #endif using namespace App;