ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 10:08:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to OCCT6.5.1

Browse Source
This commit is contained in:
jfa 2011-08-12 13:08:51 +00:00
parent e2ef963137
commit 975caf67e2
41 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GEOM/GEOM_Engine.cxx
View File

@ -32,7 +32,7 @@
#include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx" #include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx"
#include "GEOM_PythonDump.hxx" #include "GEOM_PythonDump.hxx"
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"

2
src/GEOM/GEOM_Engine.hxx
View File

@ -26,7 +26,7 @@
#include "GEOM_Object.hxx" #include "GEOM_Object.hxx"
#include "GEOM_DataMapOfAsciiStringTransient.hxx" #include "GEOM_DataMapOfAsciiStringTransient.hxx"
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 #if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
#include <TColStd_DataMapOfIntegerTransient.hxx> #include <TColStd_DataMapOfIntegerTransient.hxx>

2
src/GEOM/GEOM_Function.cxx
View File

@ -26,7 +26,7 @@
#include <GEOM_Solver.hxx> #include <GEOM_Solver.hxx>
#include <GEOM_ISubShape.hxx> #include <GEOM_ISubShape.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"

1
src/GEOM/Makefile.am
View File

@ -66,7 +66,6 @@ libGEOMbasic_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(GUI_CXXFLAGS) \
-I$(top_builddir)/idl -I$(top_builddir)/idl
libGEOMbasic_la_LDFLAGS = \ libGEOMbasic_la_LDFLAGS = \

2
src/GEOMAlgo/BlockFix_UnionFaces.cxx
View File

@ -25,7 +25,7 @@
#include <BlockFix_UnionFaces.ixx> #include <BlockFix_UnionFaces.ixx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <ShapeAnalysis_WireOrder.hxx> #include <ShapeAnalysis_WireOrder.hxx>
#include <ShapeAnalysis_Edge.hxx> #include <ShapeAnalysis_Edge.hxx>

2
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx
View File

@ -18,7 +18,7 @@
#include <GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx> #include <GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#ifndef _Standard_TypeMismatch_HeaderFile #ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx> #include <Standard_TypeMismatch.hxx>

2
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx
View File

@ -21,7 +21,7 @@
#include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx> #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#ifndef _Standard_TypeMismatch_HeaderFile #ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx> #include <Standard_TypeMismatch.hxx>

2
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx
View File

@ -18,7 +18,7 @@
#include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx> #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#ifndef _Standard_TypeMismatch_HeaderFile #ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx> #include <Standard_TypeMismatch.hxx>

2
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx
View File

@ -21,7 +21,7 @@
#include <GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx> #include <GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#ifndef _Standard_TypeMismatch_HeaderFile #ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx> #include <Standard_TypeMismatch.hxx>

2
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx
View File

@ -21,7 +21,7 @@
#include <GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx> #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#ifndef _Standard_TypeMismatch_HeaderFile #ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx> #include <Standard_TypeMismatch.hxx>

2
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx
View File

@ -21,7 +21,7 @@
#include <GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx> #include <GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#ifndef _Standard_TypeMismatch_HeaderFile #ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx> #include <Standard_TypeMismatch.hxx>

2
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx
View File

@ -21,7 +21,7 @@
#include <GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx> #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#ifndef _Standard_TypeMismatch_HeaderFile #ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx> #include <Standard_TypeMismatch.hxx>

2
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx
View File

@ -21,7 +21,7 @@
#include <GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx> #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#ifndef _Standard_TypeMismatch_HeaderFile #ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx> #include <Standard_TypeMismatch.hxx>

1
src/GEOMAlgo/Makefile.am
View File

@ -360,7 +360,6 @@ salomeinclude_HEADERS = \
libGEOMAlgo_la_CPPFLAGS = \ libGEOMAlgo_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(GUI_CXXFLAGS) \
-I$(srcdir)/../NMTDS \ -I$(srcdir)/../NMTDS \
-I$(srcdir)/../NMTTools -I$(srcdir)/../NMTTools

2
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -47,7 +47,7 @@
#include <SUIT_ViewManager.h> #include <SUIT_ViewManager.h>
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>

2
src/GEOMGUI/GeometryGUI.cxx
View File

@ -68,7 +68,7 @@
#include <SALOMEDSClient_ClientFactory.hxx> #include <SALOMEDSClient_ClientFactory.hxx>
#include <SALOMEDSClient_IParameters.hxx> #include <SALOMEDSClient_IParameters.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
// External includes // External includes
#include <QMenu> #include <QMenu>

2
src/GEOMGUI/GeometryGUI.h
View File

@ -28,7 +28,7 @@
#include "GEOM_GEOMGUI.hxx" #include "GEOM_GEOMGUI.hxx"
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <SalomeApp_Module.h> #include <SalomeApp_Module.h>

2
src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
View File

@ -21,7 +21,7 @@
#include <Standard_Stream.hxx> #include <Standard_Stream.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <GEOMImpl_I3DPrimOperations.hxx> #include <GEOMImpl_I3DPrimOperations.hxx>

2
src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
View File

@ -34,7 +34,7 @@
#include "GEOMImpl_Gen.hxx" #include "GEOMImpl_Gen.hxx"
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <utilities.h> #include <utilities.h>
#include <OpUtil.hxx> #include <OpUtil.hxx>

2
src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
View File

@ -23,7 +23,7 @@
#include <GEOMImpl_IBasicOperations.hxx> #include <GEOMImpl_IBasicOperations.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"
#include <OpUtil.hxx> #include <OpUtil.hxx>

2
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
View File

@ -45,7 +45,7 @@
#include <GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx> #include <GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx>
#include <BlockFix_CheckTool.hxx> #include <BlockFix_CheckTool.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"
#include <OpUtil.hxx> #include <OpUtil.hxx>

2
src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
View File

@ -34,7 +34,7 @@
#include <GEOMImpl_PartitionDriver.hxx> #include <GEOMImpl_PartitionDriver.hxx>
#include <GEOMImpl_IPartition.hxx> #include <GEOMImpl_IPartition.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <TDF_Tool.hxx> #include <TDF_Tool.hxx>

2
src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
View File

@ -57,7 +57,7 @@
#include <GEOMImpl_ISketcher.hxx> #include <GEOMImpl_ISketcher.hxx>
#include <GEOMImpl_I3DSketcher.hxx> #include <GEOMImpl_I3DSketcher.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"

1
src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Standard_Stream.hxx> #include <Standard_Stream.hxx>

2
src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
View File

@ -35,7 +35,7 @@
#include <GEOMImpl_IHealing.hxx> #include <GEOMImpl_IHealing.hxx>
#include <GEOMImpl_CopyDriver.hxx> #include <GEOMImpl_CopyDriver.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"
#include <OpUtil.hxx> #include <OpUtil.hxx>

2
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -33,7 +33,7 @@
#include <GEOM_Function.hxx> #include <GEOM_Function.hxx>
#include <GEOM_PythonDump.hxx> #include <GEOM_PythonDump.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"
#include <OpUtil.hxx> #include <OpUtil.hxx>

2
src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
View File

@ -26,7 +26,7 @@
#include "GEOM_Engine.hxx" #include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx" #include "GEOM_Object.hxx"
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "Utils_SALOME_Exception.hxx" #include "Utils_SALOME_Exception.hxx"

2
src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
View File

@ -44,7 +44,7 @@
#include <GEOM_Function.hxx> #include <GEOM_Function.hxx>
#include <GEOM_PythonDump.hxx> #include <GEOM_PythonDump.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"
#include <OpUtil.hxx> #include <OpUtil.hxx>

2
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
View File

@ -34,7 +34,7 @@
#include <GEOM_Function.hxx> #include <GEOM_Function.hxx>
#include <GEOM_PythonDump.hxx> #include <GEOM_PythonDump.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <utilities.h> #include <utilities.h>
#include <OpUtil.hxx> #include <OpUtil.hxx>

2
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
View File

@ -56,7 +56,7 @@
#include "GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx" #include "GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx"
#include "GEOMAlgo_ListOfCoupleOfShapes.hxx" #include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"
#include "OpUtil.hxx" #include "OpUtil.hxx"

2
src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
View File

@ -43,7 +43,7 @@
#include <GEOM_Function.hxx> #include <GEOM_Function.hxx>
#include <GEOM_PythonDump.hxx> #include <GEOM_PythonDump.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include "utilities.h" #include "utilities.h"
#include <OpUtil.hxx> #include <OpUtil.hxx>

1
src/GEOMImpl/Makefile.am
View File

@ -227,7 +227,6 @@ libGEOMimpl_la_CPPFLAGS = \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(GUI_CXXFLAGS) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(PYTHON_INCLUDES) \ $(PYTHON_INCLUDES) \
-I$(srcdir)/../ShHealOper \ -I$(srcdir)/../ShHealOper \

2
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -38,7 +38,7 @@
#include <GEOMBase.h> #include <GEOMBase.h>
#include <GEOM_Actor.h> #include <GEOM_Actor.h>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <SALOME_ListIO.hxx> #include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx> #include <SALOME_ListIteratorOfListIO.hxx>

2
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
View File

@ -24,7 +24,7 @@
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include <GEOM_Displayer.h> #include <GEOM_Displayer.h>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <QtxComboBox.h> #include <QtxComboBox.h>
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>

2
src/GEOM_I/GEOM_IInsertOperations_i.cc
View File

@ -34,7 +34,7 @@
#include "GEOM_Engine.hxx" #include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx" #include "GEOM_Object.hxx"
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <TColStd_HSequenceOfAsciiString.hxx> #include <TColStd_HSequenceOfAsciiString.hxx>

1
src/GEOM_I/Makefile.am
View File

@ -75,7 +75,6 @@ libGEOMEngine_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(GUI_CXXFLAGS) \
-I$(srcdir)/../SKETCHER \ -I$(srcdir)/../SKETCHER \
-I$(srcdir)/../ARCHIMEDE \ -I$(srcdir)/../ARCHIMEDE \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \

2
src/MeasureGUI/MeasureGUI_AngleDlg.cxx
View File

@ -27,7 +27,7 @@
#include <GEOMBase.h> #include <GEOMBase.h>
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>

1
src/NMTTools/Makefile.am
View File

@ -138,7 +138,6 @@ dist_libNMTTools_la_SOURCES = \
libNMTTools_la_CPPFLAGS = \ libNMTTools_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(GUI_CXXFLAGS) \
-I$(srcdir)/../NMTDS -I$(srcdir)/../NMTDS
libNMTTools_la_LDFLAGS = \ libNMTTools_la_LDFLAGS = \

2
src/NMTTools/NMTTools_PaveFiller_2.cxx
View File

@ -27,7 +27,7 @@
#include <NMTTools_PaveFiller.ixx> #include <NMTTools_PaveFiller.ixx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <Precision.hxx> #include <Precision.hxx>

3
src/STEPImport/Makefile.am
View File

@ -36,8 +36,7 @@ dist_libSTEPImport_la_SOURCES = \
libSTEPImport_la_CPPFLAGS = \ libSTEPImport_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS)
$(GUI_CXXFLAGS)
libSTEPImport_la_LDFLAGS = \ libSTEPImport_la_LDFLAGS = \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \

2
src/STEPImport/STEPImport.cxx
View File

@ -27,7 +27,7 @@
#include <Basics_Utils.hxx> #include <Basics_Utils.hxx>
#include <CASCatch_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>
#include <BRep_Builder.hxx> #include <BRep_Builder.hxx>