From: Mikhail PONIKAROV Date: Tue, 30 Dec 2014 12:01:45 +0000 (+0300) Subject: Porting to CentOS X-Git-Tag: V_0.7.0_rc1~3^2~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d150af3c6e788269822b07b3bf344a66b71b523f;p=modules%2Fshaper.git Porting to CentOS --- diff --git a/make.sh b/make.sh index 45d88f5a1..ef61abcce 100755 --- a/make.sh +++ b/make.sh @@ -9,7 +9,7 @@ source ${SRC_DIR}/linux_env.sh mkdir -p ${ROOT_DIR}/build cd ${ROOT_DIR}/build -CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Debug" +CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/install" CMAKE_ARGS="${CMAKE_ARGS} ${SRC_DIR}" diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_BREPImport.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_BREPImport.cpp index 6d676af7c..2df29ebc0 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_BREPImport.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_BREPImport.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -#include +#include #include #include diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_STEPImport.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_STEPImport.cpp index 2510db413..8ed138604 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_STEPImport.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_STEPImport.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -#include +#include #include #include diff --git a/src/Model/Model_Application.cpp b/src/Model/Model_Application.cpp index 204cafe14..128f6ee4d 100644 --- a/src/Model/Model_Application.cpp +++ b/src/Model/Model_Application.cpp @@ -98,7 +98,8 @@ void Model_Application::removeUselessDocuments( } if (!aFound) { // remove the useless aDoc->second->close(); - aDoc = myDocs.erase(aDoc); + myDocs.erase(aDoc); + aDoc = myDocs.begin(); } else { aDoc++; } diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp index bcf8a57b3..321d24d9d 100644 --- a/src/Model/Model_AttributeSelection.cpp +++ b/src/Model/Model_AttributeSelection.cpp @@ -384,7 +384,7 @@ void Model_AttributeSelection::selectBody( /// registers the name of the shape in the label (theID == 0) of sub label (theID is a tag) /// if theID is zero, -static void registerSubShape(TDF_Label& theMainLabel, TopoDS_Shape theShape, +static void registerSubShape(TDF_Label theMainLabel, TopoDS_Shape theShape, const int theID, const FeaturePtr& theContextFeature, std::shared_ptr theDoc, std::string theAdditionalName, Handle(TDataStd_IntPackedMap) theRefs = Handle(TDataStd_IntPackedMap)()) diff --git a/src/PartSet/PartSet_SketcherMgr.cpp b/src/PartSet/PartSet_SketcherMgr.cpp index 2b0b5e121..77ef4f541 100644 --- a/src/PartSet/PartSet_SketcherMgr.cpp +++ b/src/PartSet/PartSet_SketcherMgr.cpp @@ -6,7 +6,7 @@ #include "PartSet_SketcherMgr.h" #include "PartSet_Module.h" -#include "PartSet_WidgetPoint2D.h" +#include "PartSet_WidgetPoint2d.h" #include "PartSet_Tools.h" #include