suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment to mask warnings when compiling salomesmesh.

Browse Source
This commit is contained in:
Eivind Kvedalen 2015-09-17 18:47:58 +02:00 committed by wmayer
parent d3d7387da2
commit 2206e1cd7f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdParty/salomesmesh/CMakeLists.txt vendored
View File

@ -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(

9
src/Mod/Spreadsheet/App/Sheet.cpp
View File

@ -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,12 +607,12 @@ 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;
}
@ -622,7 +620,6 @@ void Sheet::updateProperty(CellAddress key)
clear(key);
cellUpdated(key);
(void)prop;
}
/**