Merge branch 'Dev_0.6.1' of ssh://newgeom.redmine.opencascade.com:322/newgeom into...

diff --git a/make.sh b/make.sh
index 45d88f5a1886ea3e968cfb1a82cc53da4cd4f3f8..ef61abcce00baedbc0e58a9ca914ea71947d8272 100755 (executable)
--- 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 6d676af7c31bc9131eb1c8b158d0f10efe81df38..2df29ebc080dedf4445d8563d8b6b54616c14d78 100644 (file)
--- 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 <GEOMALGOAPI_BREPImport.h>
+#include <GeomAlgoAPI_BREPImport.h>
 
 #include <BRepTools.hxx>
 #include <BRep_Builder.hxx>

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_STEPImport.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_STEPImport.cpp
index 2510db41360e71bc99d01f9da86c6d8f57fa4e0b..8ed138604b6ebfea7cf7d14f52b1fbe35e2feb3c 100644 (file)
--- 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 <GEOMALGOAPI_STEPImport.h>
+#include <GeomAlgoAPI_STEPImport.h>
 
 #include <TDF_ChildIDIterator.hxx>
 #include <TDF_Label.hxx>

diff --git a/src/Model/Model_Application.cpp b/src/Model/Model_Application.cpp
index 204cafe1418d99d1e690eb87fe5b6242cc46003a..128f6ee4dffa76228158d713d4a5967ffabb6d8b 100644 (file)
--- 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 bcf8a57b3d18bcb63917524d87b95d5b727ee5de..321d24d9d1331dd4c0c6366784c4868c5c8d4af6 100644 (file)
--- 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<Model_Document> 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 074e9b686735eeb321addfcdefeb677415a3037b..e8dce9b054fda73c96867dd59382767aff957152 100644 (file)
--- 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 <XGUI_ModuleConnector.h>