+ fix & suppress msvc warnings

FreeCAD · Oct 16, 2015 · 9abedaf · 9abedaf
1 parent a36bf71
commit 9abedaf
Show file tree

Hide file tree

Showing 17 changed files with 63 additions and 8 deletions.
diff --git 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
@@ -54,6 +54,10 @@
 #include <Standard_ErrorHandler.hxx>
 
 // Netgen include files
+#ifdef _MSC_VER
+#pragma warning(disable : 4067)
+#endif
+
 namespace nglib {
 #include <nglib.h>
 }

diff --git 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 <nglib.h>
 }

diff --git 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 <nglib.h>

diff --git 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
@@ -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 <Quarter/devices/InputDevice.h>
 #include <QtGui/QInputEvent>
 #include <Inventor/events/SoEvents.h>

diff --git 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 <Quarter/devices/Keyboard.h>
 
 #include <QtCore/QEvent>

diff --git 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 <Quarter/devices/Mouse.h>
 
 #include <QtCore/QEvent>

diff --git 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 <assert.h>
 
 #include <QtCore/QEvent>

diff --git a/src/Gui/Quarter/QuarterWidgetP.cpp b/src/Gui/Quarter/QuarterWidgetP.cpp
@@ -34,6 +34,10 @@
 #include <Quarter/QuarterWidget.h>
 #include <Quarter/eventhandlers/EventFilter.h>
 
+#ifdef _MSC_VER
+#pragma warning(disable : 4267)
+#endif
+
 #include <QtGui/QApplication>
 #include <QtGui/QCursor>
 #include <QtGui/QMenu>

diff --git 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 <Quarter/devices/SpaceNavigatorDevice.h>
 
 #include <QtGui/QApplication>

diff --git 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 <boost/progress.hpp>
 #include <boost/timer.hpp>

diff --git 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 <stdio.h>
 #include <assert.h>

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
@@ -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
@@ -19,6 +19,11 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                *
  *                                                                         *
  ***************************************************************************/
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4244)
+#endif
+
 #include <iostream>
 #include <algorithm>
 #include <cfloat>

diff --git 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 <iostream>
 #include <Eigen/QR>
 

diff --git 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;