Added -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable…

… -Wno-unused-but-set-variable -Wno-comment to mask warnings when compiling salomesmesh.
FreeCAD · Sep 21, 2015 · 2206e1c · 2206e1c
1 parent d3d7387
commit 2206e1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt
@@ -6,6 +6,8 @@ SET(SMESH_VERSION_MINOR 1)
 SET(SMESH_VERSION_PATCH 2)
 SET(SMESH_VERSION_TWEAK 2)
 
+set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment")
+
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 include_directories(

diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp
@@ -585,8 +585,6 @@ void Sheet::updateAlias(CellAddress key)
 
 void Sheet::updateProperty(CellAddress key)
 {
-    const Property * prop;
-
     Cell * cell = getCell(key);
 
     if (cell != 0) {
@@ -609,20 +607,19 @@ void Sheet::updateProperty(CellAddress key)
         if (freecad_dynamic_cast<NumberExpression>(output)) {
             NumberExpression * number = static_cast<NumberExpression*>(output);
             if (number->getUnit().isEmpty())
-                prop = setFloatProperty(key, number->getValue());
+                setFloatProperty(key, number->getValue());
             else
-                prop = setQuantityProperty(key, number->getValue(), number->getUnit());
+                setQuantityProperty(key, number->getValue(), number->getUnit());
         }
         else
-            prop = setStringProperty(key, freecad_dynamic_cast<StringExpression>(output)->getText().c_str());
+            setStringProperty(key, freecad_dynamic_cast<StringExpression>(output)->getText().c_str());
 
         delete output;
     }
     else
         clear(key);
 
     cellUpdated(key);
-    (void)prop;
 }
 
 /**