0024816: Tool for upgrading OCCT and dependent code

A new script adm/upgrade.tcl defines a Tcl procedure occt_upgrade, to be used for upgrading code of OCCT and applications for changes introduced by OCCT 7.0.
Batch script upgrade.bat is provided for convenience.
File upgrade.dat contains data (lists of classes) required for some upgrade steps.
Details on upgrade procedure are put in dox/dev_guides/upgrade/upgrade.md.

OCCT code corrected to improve compatibility with code based on previous versions of OCCT:
- Added conversion operator of handle to bool, for use in conditional expressions.
- Forward declaration of argument class restored in macro DEFINE_STANDARD_HANDLE.
- Includes of used classes added in some headers to avoid problem of missing includes in dependent code
- Type cast operators to base curve and surface added in GC and GCE2d classes to reduce porting issues.

Added test for local reference to handle initialized by temporary handle to derived class.

WOK and CDL User Guides removed.

.gitattributes

@@ -44,6 +44,7 @@ UDLIST      eol=lf
 tests/*     eol=lf
 tests/*/*   eol=lf
 tests/*/*/* eol=lf
+adm/upgrade.dat eol=lf
 *.bat       eol=crlf
 *.cmd       eol=crlf
 *.rc        eol=crlf

.gitignore

@@ -29,6 +29,7 @@ Release
 /adm/mac
 /adm/make
 *.vcproj*user
+*.vcxproj*user
 *.csproj*user
 *.ncb
 *.suo

adm/genconf.tcl

@@ -1,8 +1,30 @@
 #!/usr/bin/tclsh
 
-package require Tk
+# =======================================================================
+# Created on: 2012-01-26
+# Created by: Kirill GAVRILOV
+# Copyright (c) 2012 OPEN CASCADE SAS
+#
+# This file is part of Open CASCADE Technology software library.
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 2.1 as published
+# by the Free Software Foundation, with special exception defined in the file
+# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+# distribution for complete text of the license and disclaimer of any warranty.
+#
+# Alternatively, this file may be used under the terms of Open CASCADE
+# commercial license or contractual agreement.
 
-source "./adm/genconfdeps.tcl"
+# =======================================================================
+# GUI procedure for search of third-party tools and generation of environment
+# customization script
+# =======================================================================
+
+# load tools
+source [file join [file dirname [info script]] genconfdeps.tcl]
+
+package require Tk
 
 set aRowIter 0
 frame .myFrame -padx 5 -pady 5

adm/genconfdeps.tcl

@@ -1,4 +1,23 @@
-#!/usr/bin/tclsh
+# =======================================================================
+# Created on: 2012-01-26
+# Created by: Kirill GAVRILOV
+# Copyright (c) 2012 OPEN CASCADE SAS
+#
+# This file is part of Open CASCADE Technology software library.
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 2.1 as published
+# by the Free Software Foundation, with special exception defined in the file
+# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+# distribution for complete text of the license and disclaimer of any warranty.
+#
+# Alternatively, this file may be used under the terms of Open CASCADE
+# commercial license or contractual agreement.
+
+# =======================================================================
+# Tools for search of third-party libraries and generation on environment
+# customization script
+# =======================================================================
 
 set ARCH "64"
 

adm/gendoc.tcl

@@ -14,9 +14,14 @@
 #
 # Alternatively, this file may be used under the terms of Open CASCADE
 # commercial license or contractual agreement.
-# 
-# Brief:  This script compiles OCCT documents from *.md files to HTML pages
+ 
 # =======================================================================
+# This script defines command gendoc compiling OCCT documents 
+# from *.md files to HTML pages
+# =======================================================================
+
+# load auxiliary tools
+source [file join [file dirname [info script]] occaux.tcl]
 
 # ======================================
 #  Common functions

adm/genproj.tcl

@@ -1,5 +1,22 @@
 # =======================================================================
-# This script generates project files for different IDEs:
+# Created on: 2014-07-24
+# Created by: SKI
+# Copyright (c) 2014 OPEN CASCADE SAS
+#
+# This file is part of Open CASCADE Technology software library.
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 2.1 as published
+# by the Free Software Foundation, with special exception defined in the file
+# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+# distribution for complete text of the license and disclaimer of any warranty.
+#
+# Alternatively, this file may be used under the terms of Open CASCADE
+# commercial license or contractual agreement.
+
+# =======================================================================
+# This script defines Tcl command genproj generating project files for 
+# different IDEs: 
 # "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "cbp" "amk" "xcd"
 #
 # Example:
@@ -7,6 +24,8 @@
 #      genproj -target=xcd -ios -static
 # =======================================================================
 
+source [file join [file dirname [info script]] genconfdeps.tcl]
+
 set path ""
 set fBranch ""
 switch -exact -- "$tcl_platform(platform)" {
@@ -18,8 +37,6 @@ switch -exact -- "$tcl_platform(os)" {
   "Darwin"  {set targetStation "mac"}
 }
 
-source "./adm/genconfdeps.tcl"
-
 proc _get_options { platform type branch } {
   global path
   set res ""
@@ -3793,6 +3810,3 @@ proc osutils:xcdx { theOutDir theExecutable theGuidsMap } {
   puts $aPlistFile $aPlistTmpl
   close $aPlistFile
 }
-
-# launch generation
-genproj {*}$::argv

adm/occaux.tcl

@@ -14,8 +14,9 @@
 #
 # Alternatively, this file may be used under the terms of Open CASCADE
 # commercial license or contractual agreement.
-# 
-# Brief: This script contains auxilary functions which can be used 
+ 
+# =======================================================================
+# This script contains auxilary functions which can be used 
 # in documentation generation process
 # =======================================================================
 

adm/start.tcl

@@ -1,8 +1,30 @@
 #!/usr/bin/tclsh
 
-# Command-line starter for occdoc command, use it as follows:
-# tclsh> source dox/start.tcl [arguments]
+# =======================================================================
+# Created on: 2014-03-21
+# Created by: OMY
+# Copyright (c) 1996-1999 Matra Datavision
+# Copyright (c) 1999-2014 OPEN CASCADE SAS
+#
+# This file is part of Open CASCADE Technology software library.
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 2.1 as published
+# by the Free Software Foundation, with special exception defined in the file
+# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+# distribution for complete text of the license and disclaimer of any warranty.
+#
+# Alternatively, this file may be used under the terms of Open CASCADE
+# commercial license or contractual agreement.
  
-source [file join [file dirname [info script]] occaux.tcl]
-source [file join [file dirname [info script]] gendoc.tcl]
-gendoc {*}$::argv
+if { [llength $argv] < 1 } {
+  puts "Command-line starter for Tcl command defined in same-named file."
+  puts "Use it as follows:"
+  puts "\> tclsh start.tcl command \[arguments\]"
+  return
+}
+
+set cmdname [lindex $argv 0]
+source [file join [file dirname [info script]] $cmdname.tcl]
+
+eval $cmdname [lrange $argv 1 end]

adm/upgrade.dat

@@ -0,0 +1,924 @@
+[rename]
+BRepExtrema_OverlappedSubShapes BRepExtrema_MapOfIntegerPackedMapOfInteger
+
+[tcollection]
+AdvApp2Var_SequenceOfNode
+AdvApp2Var_SequenceOfPatch
+AdvApp2Var_SequenceOfStrip
+AdvApp2Var_Strip
+AIS_DataMapOfILC
+AIS_DataMapofIntegerListOfinteractive
+AIS_DataMapOfIOStatus
+AIS_DataMapOfSelStat
+AIS_IndexedDataMapOfOwnerPrs
+AIS_ListOfInteractive
+AIS_MapOfInteractive
+AIS_SequenceOfDimension
+AIS_SequenceOfInteractive
+AppDef_Array1OfMultiPointConstraint
+AppDef_HArray1OfMultiPointConstraint
+AppParCurves_Array1OfConstraintCouple
+AppParCurves_Array1OfMultiBSpCurve
+AppParCurves_Array1OfMultiCurve
+AppParCurves_Array1OfMultiPoint
+AppParCurves_HArray1OfConstraintCouple
+AppParCurves_HArray1OfMultiBSpCurve
+AppParCurves_HArray1OfMultiCurve
+AppParCurves_HArray1OfMultiPoint
+AppParCurves_SequenceOfMultiBSpCurve
+AppParCurves_SequenceOfMultiCurve
+Approx_Array1OfAdHSurface
+Approx_Array1OfGTrsf2d
+Approx_HArray1OfAdHSurface
+Approx_HArray1OfGTrsf2d
+Approx_SequenceOfHArray1OfReal
+Aspect_SequenceOfColor
+BinMDF_TypeADriverMap
+BinMDF_TypeIdMap
+BiTgte_DataMapOfShapeBox
+Blend_SequenceOfPoint
+Bnd_Array1OfBox
+Bnd_Array1OfBox2d
+Bnd_Array1OfSphere
+Bnd_HArray1OfBox
+Bnd_HArray1OfBox2d
+Bnd_HArray1OfSphere
+Bnd_SeqOfBox
+BRep_ListOfCurveRepresentation
+BRep_ListOfPointRepresentation
+BRepAdaptor_Array1OfCurve
+BRepAdaptor_HArray1OfCurve
+BRepAlgo_DataMapOfShapeBoolean
+BRepAlgo_DataMapOfShapeInterference
+BRepAlgo_SequenceOfSequenceOfInteger
+BRepBlend_SequenceOfLine
+BRepBlend_SequenceOfPointOnRst
+BRepCheck_DataMapOfShapeListOfStatus
+BRepCheck_DataMapOfShapeResult
+BRepCheck_ListOfStatus
+BRepClass3d_MapOfInter
+BRepFill_DataMapOfNodeDataMapOfShapeShape
+BRepFill_DataMapOfNodeShape
+BRepFill_DataMapOfOrientedShapeListOfShape
+BRepFill_DataMapOfShapeDataMapOfShapeListOfShape
+BRepFill_DataMapOfShapeHArray2OfShape
+BRepFill_DataMapOfShapeSequenceOfPnt
+BRepFill_DataMapOfShapeSequenceOfReal
+BRepFill_IndexedDataMapOfOrientedShapeListOfShape
+BRepFill_ListOfOffsetWire
+BRepFill_SequenceOfEdgeFaceAndOrder
+BRepFill_SequenceOfFaceAndOrder
+BRepFill_SequenceOfSection
+BRepMAT2d_DataMapOfBasicEltShape
+BRepMAT2d_DataMapOfShapeSequenceOfBasicElt
+BRepOffset_DataMapOfShapeListOfInterval
+BRepOffset_DataMapOfShapeMapOfShape
+BRepOffset_DataMapOfShapeOffset
+BRepOffset_ListOfInterval
+BRepOffsetAPI_SequenceOfSequenceOfReal
+BRepOffsetAPI_SequenceOfSequenceOfShape
+BRepTools_MapOfVertexPnt2d
+BRepTopAdaptor_MapOfShapeTool
+CDM_DocumentHasher
+CDM_ListOfDocument
+CDM_ListOfReferences
+CDM_MapOfDocument
+CDM_MetaDataLookUpTable
+CDM_PresentationDirectory
+ChFiDS_HData
+ChFiDS_IndexedDataMapOfVertexListOfStripe
+ChFiDS_ListOfHElSpine
+ChFiDS_ListOfStripe
+ChFiDS_Regularities
+ChFiDS_SecArray1
+ChFiDS_SecHArray1
+ChFiDS_SequenceOfSpine
+ChFiDS_SequenceOfSurfData
+ChFiDS_StripeArray1
+ChFiKPart_RstMap
+Contap_TheHSequenceOfPoint
+Contap_TheSequenceOfLine
+Contap_TheSequenceOfPoint
+Convert_SequenceOfArray1OfPoles
+DBRep_ListOfEdge
+DBRep_ListOfFace
+DBRep_ListOfHideData
+DDF_TransactionStack
+DNaming_DataMapOfShapeOfName
+Draft_DataMapOfEdgeEdgeInfo
+Draft_DataMapOfFaceFaceInfo
+Draft_DataMapOfVertexVertexInfo
+Draw_MapOfAsciiString
+Draw_SequenceOfDrawable3D
+Expr_Array1OfGeneralExpression
+Expr_Array1OfNamedUnknown
+Expr_Array1OfSingleRelation
+Expr_MapOfNamedUnknown
+Expr_SequenceOfGeneralExpression
+Expr_SequenceOfGeneralRelation
+ExprIntrp_SequenceOfNamedExpression
+ExprIntrp_SequenceOfNamedFunction
+ExprIntrp_StackOfGeneralExpression
+ExprIntrp_StackOfGeneralFunction
+ExprIntrp_StackOfGeneralRelation
+Extrema_Array1OfPOnCurv
+Extrema_Array1OfPOnCurv2d
+Extrema_Array1OfPOnSurf
+Extrema_Array2OfPOnCurv
+Extrema_Array2OfPOnCurv2d
+Extrema_Array2OfPOnSurf
+Extrema_Array2OfPOnSurfParams
+Extrema_HArray1OfPOnCurv
+Extrema_HArray1OfPOnCurv2d
+Extrema_HArray1OfPOnSurf
+Extrema_HArray2OfPOnCurv
+Extrema_HArray2OfPOnCurv2d
+Extrema_HArray2OfPOnSurf
+Extrema_HArray2OfPOnSurfParams
+Extrema_SequenceOfPOnCurv
+Extrema_SequenceOfPOnCurv2d
+Extrema_SequenceOfPOnSurf
+FEmTool_AssemblyTable
+FEmTool_HAssemblyTable
+FEmTool_ListOfVectors
+FEmTool_SeqOfLinConstr
+GccEnt_Array1OfPosition
+Geom2dHatch_Hatchings
+Geom2dHatch_MapOfElements
+Geom_HSequenceOfBSplineSurface
+Geom_SequenceOfBSplineSurface
+GeomFill_Array1OfLocationLaw
+GeomFill_Array1OfSectionLaw
+GeomFill_HArray1OfLocationLaw
+GeomFill_HArray1OfSectionLaw
+GeomFill_HSequenceOfAx2
+GeomFill_SequenceOfAx2
+GeomFill_SequenceOfTrsf
+GeomInt_SequenceOfParameterAndOrientation
+GeomLib_Array1OfMat
+GeomPlate_Array1OfHCurveOnSurface
+GeomPlate_Array1OfSequenceOfReal
+GeomPlate_HArray1OfHCurveOnSurface
+GeomPlate_HArray1OfSequenceOfReal
+GeomPlate_HSequenceOfCurveConstraint
+GeomPlate_HSequenceOfPointConstraint
+GeomPlate_SequenceOfAij
+GeomPlate_SequenceOfCurveConstraint
+GeomPlate_SequenceOfPointConstraint
+Graphic3d_Array1OfVector
+Graphic3d_Array1OfVertex
+Graphic3d_Array2OfVertex
+Graphic3d_HSequenceOfStructure
+Graphic3d_ListOfShortReal
+Graphic3d_SequenceOfStructure
+Hatch_SequenceOfLine
+Hatch_SequenceOfParameter
+HatchGen_Domains
+HatchGen_PointsOnElement
+HatchGen_PointsOnHatching
+HLRAlgo_Array1OfPHDat
+HLRAlgo_Array1OfPINod
+HLRAlgo_Array1OfPISeg
+HLRAlgo_Array1OfTData
+HLRAlgo_HArray1OfPHDat
+HLRAlgo_HArray1OfPINod
+HLRAlgo_HArray1OfPISeg
+HLRAlgo_HArray1OfTData
+HLRAlgo_InterferenceList
+HLRAlgo_ListOfBPoint
+HLRBRep_Array1OfEData
+HLRBRep_Array1OfFData
+HLRBRep_ListOfBPnt2D
+HLRBRep_ListOfBPoint
+HLRBRep_SeqOfShapeBounds
+HLRTopoBRep_DataMapOfShapeFaceData
+HLRTopoBRep_ListOfVData
+HLRTopoBRep_MapOfShapeListOfVData
+IFSelect_HSeqOfSelection
+IFSelect_SequenceOfAppliedModifiers
+IFSelect_SequenceOfGeneralModifier
+IFSelect_SequenceOfInterfaceModel
+IFSelect_TSeqOfDispatch
+IFSelect_TSeqOfSelection
+IGESAppli_Array1OfFiniteElement
+IGESAppli_Array1OfFlow
+IGESAppli_Array1OfNode
+IGESAppli_HArray1OfFiniteElement
+IGESAppli_HArray1OfFlow
+IGESAppli_HArray1OfNode
+IGESBasic_Array1OfLineFontEntity
+IGESBasic_Array2OfHArray1OfReal
+IGESBasic_HArray1OfLineFontEntity
+IGESBasic_HArray2OfHArray1OfReal
+IGESData_Array1OfDirPart
+IGESData_Array1OfIGESEntity
+IGESData_HArray1OfIGESEntity
+IGESDefs_Array1OfTabularData
+IGESDefs_HArray1OfTabularData
+IGESDimen_Array1OfGeneralNote
+IGESDimen_Array1OfLeaderArrow
+IGESDimen_HArray1OfGeneralNote
+IGESDimen_HArray1OfLeaderArrow
+IGESDraw_Array1OfConnectPoint
+IGESDraw_Array1OfViewKindEntity
+IGESDraw_HArray1OfConnectPoint
+IGESDraw_HArray1OfViewKindEntity
+IGESGeom_Array1OfBoundary
+IGESGeom_Array1OfCurveOnSurface
+IGESGeom_Array1OfTransformationMatrix
+IGESGeom_HArray1OfBoundary
+IGESGeom_HArray1OfCurveOnSurface
+IGESGeom_HArray1OfTransformationMatrix
+IGESGraph_Array1OfColor
+IGESGraph_Array1OfTextDisplayTemplate
+IGESGraph_Array1OfTextFontDef
+IGESGraph_HArray1OfColor
+IGESGraph_HArray1OfTextDisplayTemplate
+IGESGraph_HArray1OfTextFontDef
+IGESSolid_Array1OfFace
+IGESSolid_Array1OfLoop
+IGESSolid_Array1OfShell
+IGESSolid_Array1OfVertexList
+IGESSolid_HArray1OfFace
+IGESSolid_HArray1OfLoop
+IGESSolid_HArray1OfShell
+IGESSolid_HArray1OfVertexList
+IntAna_ListOfCurve
+IntCurveSurface_SequenceOfPnt
+IntCurveSurface_SequenceOfSeg
+Interface_Array1OfFileParameter
+Interface_Array1OfHAsciiString
+Interface_DataMapOfTransientInteger
+Interface_HArray1OfHAsciiString
+Interface_HSequenceOfCheck
+Interface_IndexedMapOfAsciiString
+Interface_SequenceOfCheck
+Intf_Array1OfLin
+Intf_SeqOfSectionLine
+Intf_SeqOfSectionPoint
+Intf_SeqOfTangentZone
+IntPatch_SequenceOfLine
+IntPatch_SequenceOfPoint
+IntPolyh_SeqOfStartPoints
+IntRes2d_SequenceOfIntersectionPoint
+IntRes2d_SequenceOfIntersectionSegment
+Intrv_SequenceOfInterval
+IntSurf_ListOfPntOn2S
+IntSurf_SequenceOfCouple
+IntSurf_SequenceOfInteriorPoint
+IntSurf_SequenceOfPathPoint
+IntTools_Array1OfRange
+IntTools_Array1OfRoots
+IntTools_DataMapOfCurveSampleBox
+IntTools_DataMapOfSurfaceSampleBox
+IntTools_IndexedDataMapOfTransientAddress
+IntTools_ListOfBox
+IntTools_ListOfCurveRangeSample
+IntTools_ListOfSurfaceRangeSample
+IntTools_MapOfCurveSample
+IntTools_MapOfSurfaceSample
+IntTools_SequenceOfCommonPrts
+IntTools_SequenceOfCurves
+IntTools_SequenceOfPntOn2Faces
+IntTools_SequenceOfRanges
+IntTools_SequenceOfRoots
+Law_Laws
+LocOpe_DataMapOfShapePnt
+LocOpe_SequenceOfCirc
+LocOpe_SequenceOfLin
+LocOpe_SequenceOfPntFace
+LProp_SequenceOfCIType
+MAT2d_Array2OfConnexion
+MAT2d_DataMapOfBiIntInteger
+MAT2d_DataMapOfBiIntSequenceOfInteger
+MAT2d_DataMapOfIntegerBisec
+MAT2d_DataMapOfIntegerConnexion
+MAT2d_DataMapOfIntegerPnt2d
+MAT2d_DataMapOfIntegerSequenceOfConnexion
+MAT2d_DataMapOfIntegerVec2d
+MAT2d_SequenceOfConnexion
+MAT2d_SequenceOfSequenceOfCurve
+MAT2d_SequenceOfSequenceOfGeometry
+MAT_DataMapOfIntegerArc
+MAT_DataMapOfIntegerBasicElt
+MAT_DataMapOfIntegerBisector
+MAT_DataMapOfIntegerNode
+MAT_SequenceOfArc
+MAT_SequenceOfBasicElt
+math_Array1OfValueAndWeight
+MDF_ARDriverHSequence
+MDF_ARDriverSequence
+MDF_ASDriverHSequence
+MDF_ASDriverSequence
+MDF_TypeARDriverMap
+MDF_TypeASDriverMap
+MeshVS_Array1OfSequenceOfInteger
+MeshVS_DataMapOfColorMapOfInteger
+MeshVS_DataMapOfHArray1OfSequenceOfInteger
+MeshVS_DataMapOfIntegerAsciiString
+MeshVS_DataMapOfIntegerBoolean
+MeshVS_DataMapOfIntegerColor
+MeshVS_DataMapOfIntegerMaterial
+MeshVS_DataMapOfIntegerMeshEntityOwner
+MeshVS_DataMapOfIntegerOwner
+MeshVS_DataMapOfIntegerTwoColors
+MeshVS_DataMapOfIntegerVector
+MeshVS_DataMapOfTwoColorsMapOfInteger
+MeshVS_HArray1OfSequenceOfInteger
+MeshVS_MapOfTwoNodes
+MeshVS_SequenceOfPrsBuilder
+MeshVS_TwoColorsHasher
+MeshVS_TwoNodesHasher
+Message_ListOfMsg
+Message_SequenceOfPrinters
+Message_SequenceOfProgressScale
+MoniTool_DataMapOfShapeTransient
+MoniTool_DataMapOfTimer
+MoniTool_HSequenceOfElement
+MoniTool_IndexedDataMapOfShapeTransient
+MoniTool_SequenceOfElement
+NLPlate_SequenceOfHGPPConstraint
+NLPlate_StackOfPlate
+PCDM_SequenceOfDocument
+PCDM_SequenceOfReference
+Plate_Array1OfPinpointConstraint
+Plate_HArray1OfPinpointConstraint
+Plate_SequenceOfLinearScalarConstraint
+Plate_SequenceOfLinearXYZConstraint
+Plate_SequenceOfPinpointConstraint
+Plugin_MapOfFunctions
+Poly_Array1OfTriangle
+Poly_HArray1OfTriangle
+ProjLib_HSequenceOfHSequenceOfPnt
+ProjLib_SequenceOfHSequenceOfPnt
+PrsMgr_Presentations
+PTColStd_DoubleMapOfTransientPersistent
+PTColStd_MapPersistentHasher
+PTColStd_PersistentTransientMap
+PTColStd_TransientPersistentMap
+QANCollection_DataMapOfRealPnt
+QANCollection_DoubleMapOfRealInteger
+QANCollection_IndexedDataMapOfRealPnt
+QANCollection_ListOfPnt
+Quantity_Array1OfCoefficient
+Quantity_Array1OfColor
+Quantity_Array2OfColor
+Quantity_HArray1OfColor
+Resource_DataMapOfAsciiStringAsciiString
+Resource_DataMapOfAsciiStringExtendedString
+SelectMgr_DataMapOfObjectSelectors
+SelectMgr_IndexedDataMapOfOwnerCriterion
+SelectMgr_IndexedMapOfOwner
+SelectMgr_ListOfFilter
+SelectMgr_SequenceOfFilter
+SelectMgr_SequenceOfOwner
+SelectMgr_SequenceOfSelector
+ShapeAnalysis_DataMapOfShapeListOfReal
+ShapeAnalysis_HSequenceOfFreeBounds
+ShapeAnalysis_SequenceOfFreeBounds
+ShapeExtend_DataMapOfShapeListOfMsg
+ShapeExtend_DataMapOfTransientListOfMsg
+ShapeFix_DataMapOfShapeBox2d
+ShapeFix_SequenceOfWireSegment
+StdSelect_IndexedDataMapOfOwnerPrs
+StepAP203_Array1OfApprovedItem
+StepAP203_Array1OfCertifiedItem
+StepAP203_Array1OfChangeRequestItem
+StepAP203_Array1OfClassifiedItem
+StepAP203_Array1OfContractedItem
+StepAP203_Array1OfDateTimeItem
+StepAP203_Array1OfPersonOrganizationItem
+StepAP203_Array1OfSpecifiedItem
+StepAP203_Array1OfStartRequestItem
+StepAP203_Array1OfWorkItem
+StepAP203_HArray1OfApprovedItem
+StepAP203_HArray1OfCertifiedItem
+StepAP203_HArray1OfChangeRequestItem
+StepAP203_HArray1OfClassifiedItem
+StepAP203_HArray1OfContractedItem
+StepAP203_HArray1OfDateTimeItem
+StepAP203_HArray1OfPersonOrganizationItem
+StepAP203_HArray1OfSpecifiedItem
+StepAP203_HArray1OfStartRequestItem
+StepAP203_HArray1OfWorkItem
+StepAP214_Array1OfApprovalItem
+StepAP214_Array1OfAutoDesignDateAndPersonItem
+StepAP214_Array1OfAutoDesignDateAndTimeItem
+StepAP214_Array1OfAutoDesignDatedItem
+StepAP214_Array1OfAutoDesignGeneralOrgItem
+StepAP214_Array1OfAutoDesignGroupedItem
+StepAP214_Array1OfAutoDesignPresentedItemSelect
+StepAP214_Array1OfAutoDesignReferencingItem
+StepAP214_Array1OfDateAndTimeItem
+StepAP214_Array1OfDateItem
+StepAP214_Array1OfDocumentReferenceItem
+StepAP214_Array1OfExternalIdentificationItem
+StepAP214_Array1OfGroupItem
+StepAP214_Array1OfOrganizationItem
+StepAP214_Array1OfPersonAndOrganizationItem
+StepAP214_Array1OfPresentedItemSelect
+StepAP214_Array1OfSecurityClassificationItem
+StepAP214_HArray1OfApprovalItem
+StepAP214_HArray1OfAutoDesignDateAndPersonItem
+StepAP214_HArray1OfAutoDesignDateAndTimeItem
+StepAP214_HArray1OfAutoDesignDatedItem
+StepAP214_HArray1OfAutoDesignGeneralOrgItem
+StepAP214_HArray1OfAutoDesignGroupedItem
+StepAP214_HArray1OfAutoDesignPresentedItemSelect
+StepAP214_HArray1OfAutoDesignReferencingItem
+StepAP214_HArray1OfDateAndTimeItem
+StepAP214_HArray1OfDateItem
+StepAP214_HArray1OfDocumentReferenceItem
+StepAP214_HArray1OfExternalIdentificationItem
+StepAP214_HArray1OfGroupItem
+StepAP214_HArray1OfOrganizationItem
+StepAP214_HArray1OfPersonAndOrganizationItem
+StepAP214_HArray1OfPresentedItemSelect
+StepAP214_HArray1OfSecurityClassificationItem
+StepBasic_Array1OfApproval
+StepBasic_Array1OfDerivedUnitElement
+StepBasic_Array1OfDocument
+StepBasic_Array1OfNamedUnit
+StepBasic_Array1OfOrganization
+StepBasic_Array1OfPerson
+StepBasic_Array1OfProduct
+StepBasic_Array1OfProductContext
+StepBasic_Array1OfProductDefinition
+StepBasic_Array1OfUncertaintyMeasureWithUnit
+StepBasic_HArray1OfApproval
+StepBasic_HArray1OfDerivedUnitElement
+StepBasic_HArray1OfDocument
+StepBasic_HArray1OfNamedUnit
+StepBasic_HArray1OfOrganization
+StepBasic_HArray1OfPerson
+StepBasic_HArray1OfProduct
+StepBasic_HArray1OfProductContext
+StepBasic_HArray1OfProductDefinition
+StepBasic_HArray1OfUncertaintyMeasureWithUnit
+STEPCAFControl_DataMapOfLabelExternFile
+STEPCAFControl_DataMapOfLabelShape
+STEPCAFControl_DataMapOfPDExternFile
+STEPCAFControl_DataMapOfSDRExternFile
+STEPCAFControl_DataMapOfShapePD
+STEPCAFControl_DataMapOfShapeSDR
+STEPConstruct_DataMapOfAsciiStringTransient
+STEPConstruct_DataMapOfPointTransient
+StepData_Array1OfField
+StepData_HArray1OfField
+StepDimTol_Array1OfDatumReference
+StepDimTol_HArray1OfDatumReference
+StepElement_Array1OfCurveElementEndReleasePacket
+StepElement_Array1OfCurveElementSectionDefinition
+StepElement_Array1OfHSequenceOfCurveElementPurposeMember
+StepElement_Array1OfHSequenceOfSurfaceElementPurposeMember
+StepElement_Array1OfMeasureOrUnspecifiedValue
+StepElement_Array1OfSurfaceSection
+StepElement_Array1OfVolumeElementPurpose
+StepElement_Array1OfVolumeElementPurposeMember
+StepElement_Array2OfCurveElementPurposeMember
+StepElement_Array2OfSurfaceElementPurpose
+StepElement_Array2OfSurfaceElementPurposeMember
+StepElement_HArray1OfCurveElementEndReleasePacket
+StepElement_HArray1OfCurveElementSectionDefinition
+StepElement_HArray1OfHSequenceOfCurveElementPurposeMember
+StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember
+StepElement_HArray1OfMeasureOrUnspecifiedValue
+StepElement_HArray1OfSurfaceSection
+StepElement_HArray1OfVolumeElementPurpose
+StepElement_HArray1OfVolumeElementPurposeMember
+StepElement_HArray2OfCurveElementPurposeMember
+StepElement_HArray2OfSurfaceElementPurpose
+StepElement_HArray2OfSurfaceElementPurposeMember
+StepElement_HSequenceOfCurveElementPurposeMember
+StepElement_HSequenceOfCurveElementSectionDefinition
+StepElement_HSequenceOfElementMaterial
+StepElement_HSequenceOfSurfaceElementPurposeMember
+StepElement_SequenceOfCurveElementPurposeMember
+StepElement_SequenceOfCurveElementSectionDefinition
+StepElement_SequenceOfElementMaterial
+StepElement_SequenceOfSurfaceElementPurposeMember
+StepFEA_Array1OfCurveElementEndOffset
+StepFEA_Array1OfCurveElementEndRelease
+StepFEA_Array1OfCurveElementInterval
+StepFEA_Array1OfDegreeOfFreedom
+StepFEA_Array1OfElementRepresentation
+StepFEA_Array1OfNodeRepresentation
+StepFEA_HArray1OfCurveElementEndOffset
+StepFEA_HArray1OfCurveElementEndRelease
+StepFEA_HArray1OfCurveElementInterval
+StepFEA_HArray1OfDegreeOfFreedom
+StepFEA_HArray1OfElementRepresentation
+StepFEA_HArray1OfNodeRepresentation
+StepFEA_HSequenceOfCurve3dElementProperty
+StepFEA_HSequenceOfElementGeometricRelationship
+StepFEA_HSequenceOfElementRepresentation
+StepFEA_HSequenceOfNodeRepresentation
+StepFEA_SequenceOfCurve3dElementProperty
+StepFEA_SequenceOfElementGeometricRelationship
+StepFEA_SequenceOfElementRepresentation
+StepFEA_SequenceOfNodeRepresentation
+StepGeom_Array1OfBoundaryCurve
+StepGeom_Array1OfCartesianPoint
+StepGeom_Array1OfCompositeCurveSegment
+StepGeom_Array1OfCurve
+StepGeom_Array1OfPcurveOrSurface
+StepGeom_Array1OfSurfaceBoundary
+StepGeom_Array1OfTrimmingSelect
+StepGeom_Array2OfCartesianPoint
+StepGeom_Array2OfSurfacePatch
+StepGeom_HArray1OfBoundaryCurve
+StepGeom_HArray1OfCartesianPoint
+StepGeom_HArray1OfCompositeCurveSegment
+StepGeom_HArray1OfCurve
+StepGeom_HArray1OfPcurveOrSurface
+StepGeom_HArray1OfSurfaceBoundary
+StepGeom_HArray1OfTrimmingSelect
+StepGeom_HArray2OfCartesianPoint
+StepGeom_HArray2OfSurfacePatch
+StepRepr_Array1OfMaterialPropertyRepresentation
+StepRepr_Array1OfPropertyDefinitionRepresentation
+StepRepr_Array1OfRepresentationItem
+StepRepr_HArray1OfMaterialPropertyRepresentation
+StepRepr_HArray1OfPropertyDefinitionRepresentation
+StepRepr_HArray1OfRepresentationItem
+StepRepr_HSequenceOfMaterialPropertyRepresentation
+StepRepr_HSequenceOfRepresentationItem
+StepRepr_SequenceOfMaterialPropertyRepresentation
+StepRepr_SequenceOfRepresentationItem
+STEPSelections_HSequenceOfAssemblyLink
+STEPSelections_SequenceOfAssemblyComponent
+STEPSelections_SequenceOfAssemblyLink
+StepShape_Array1OfConnectedEdgeSet
+StepShape_Array1OfConnectedFaceSet
+StepShape_Array1OfEdge
+StepShape_Array1OfFace
+StepShape_Array1OfFaceBound
+StepShape_Array1OfGeometricSetSelect
+StepShape_Array1OfOrientedClosedShell
+StepShape_Array1OfOrientedEdge
+StepShape_Array1OfShell
+StepShape_Array1OfValueQualifier
+StepShape_HArray1OfConnectedEdgeSet
+StepShape_HArray1OfConnectedFaceSet
+StepShape_HArray1OfEdge
+StepShape_HArray1OfFace
+StepShape_HArray1OfFaceBound
+StepShape_HArray1OfGeometricSetSelect
+StepShape_HArray1OfOrientedClosedShell
+StepShape_HArray1OfOrientedEdge
+StepShape_HArray1OfShell
+StepShape_HArray1OfValueQualifier
+StepToTopoDS_DataMapOfRI
+StepToTopoDS_DataMapOfRINames
+StepToTopoDS_DataMapOfTRI
+StepToTopoDS_PointEdgeMap
+StepToTopoDS_PointVertexMap
+StepVisual_Array1OfBoxCharacteristicSelect
+StepVisual_Array1OfCurveStyleFontPattern
+StepVisual_Array1OfDirectionCountSelect
+StepVisual_Array1OfFillStyleSelect
+StepVisual_Array1OfInvisibleItem
+StepVisual_Array1OfLayeredItem
+StepVisual_Array1OfPresentationStyleAssignment
+StepVisual_Array1OfPresentationStyleSelect
+StepVisual_Array1OfStyleContextSelect
+StepVisual_Array1OfSurfaceStyleElementSelect
+StepVisual_Array1OfTextOrCharacter
+StepVisual_HArray1OfBoxCharacteristicSelect
+StepVisual_HArray1OfCurveStyleFontPattern
+StepVisual_HArray1OfDirectionCountSelect
+StepVisual_HArray1OfFillStyleSelect
+StepVisual_HArray1OfInvisibleItem
+StepVisual_HArray1OfLayeredItem
+StepVisual_HArray1OfPresentationStyleAssignment
+StepVisual_HArray1OfPresentationStyleSelect
+StepVisual_HArray1OfStyleContextSelect
+StepVisual_HArray1OfSurfaceStyleElementSelect
+StepVisual_HArray1OfTextOrCharacter
+StlMesh_SequenceOfMesh
+StlMesh_SequenceOfMeshDomain
+StlMesh_SequenceOfMeshTriangle
+Storage_ArrayOfCallBack
+Storage_ArrayOfSchema
+Storage_HArrayOfCallBack
+Storage_HArrayOfSchema
+Storage_HPArray
+Storage_HSeqOfRoot
+Storage_MapOfCallBack
+Storage_MapOfPers
+Storage_PArray
+Storage_PType
+Storage_SeqOfRoot
+TColGeom2d_Array1OfBezierCurve
+TColGeom2d_Array1OfBSplineCurve
+TColGeom2d_Array1OfCurve
+TColGeom2d_HArray1OfBezierCurve
+TColGeom2d_HArray1OfBSplineCurve
+TColGeom2d_HArray1OfCurve
+TColGeom2d_HSequenceOfBoundedCurve
+TColGeom2d_HSequenceOfCurve
+TColGeom2d_SequenceOfBoundedCurve
+TColGeom2d_SequenceOfCurve
+TColGeom2d_SequenceOfGeometry
+TColGeom_Array1OfBezierCurve
+TColGeom_Array1OfBSplineCurve
+TColGeom_Array1OfCurve
+TColGeom_Array1OfSurface
+TColGeom_Array2OfBezierSurface
+TColGeom_Array2OfSurface
+TColGeom_HArray1OfBezierCurve
+TColGeom_HArray1OfBSplineCurve
+TColGeom_HArray1OfCurve
+TColGeom_HArray1OfSurface
+TColGeom_HArray2OfSurface
+TColGeom_HSequenceOfBoundedCurve
+TColGeom_HSequenceOfCurve
+TColGeom_SequenceOfBoundedCurve
+TColGeom_SequenceOfCurve
+TColGeom_SequenceOfSurface
+TColgp_Array1OfCirc2d
+TColgp_Array1OfDir
+TColgp_Array1OfDir2d
+TColgp_Array1OfLin2d
+TColgp_Array1OfPnt
+TColgp_Array1OfPnt2d
+TColgp_Array1OfVec
+TColgp_Array1OfVec2d
+TColgp_Array1OfXY
+TColgp_Array1OfXYZ
+TColgp_Array2OfCirc2d
+TColgp_Array2OfDir
+TColgp_Array2OfDir2d
+TColgp_Array2OfLin2d
+TColgp_Array2OfPnt
+TColgp_Array2OfPnt2d
+TColgp_Array2OfVec
+TColgp_Array2OfVec2d
+TColgp_Array2OfXY
+TColgp_Array2OfXYZ
+TColgp_HArray1OfCirc2d
+TColgp_HArray1OfDir
+TColgp_HArray1OfDir2d
+TColgp_HArray1OfLin2d
+TColgp_HArray1OfPnt
+TColgp_HArray1OfPnt2d
+TColgp_HArray1OfVec
+TColgp_HArray1OfVec2d
+TColgp_HArray1OfXY
+TColgp_HArray1OfXYZ
+TColgp_HArray2OfCirc2d
+TColgp_HArray2OfDir
+TColgp_HArray2OfDir2d
+TColgp_HArray2OfLin2d
+TColgp_HArray2OfPnt
+TColgp_HArray2OfPnt2d
+TColgp_HArray2OfVec
+TColgp_HArray2OfVec2d
+TColgp_HArray2OfXY
+TColgp_HArray2OfXYZ
+TColgp_HSequenceOfDir
+TColgp_HSequenceOfDir2d
+TColgp_HSequenceOfPnt
+TColgp_HSequenceOfPnt2d
+TColgp_HSequenceOfVec
+TColgp_HSequenceOfVec2d
+TColgp_HSequenceOfXY
+TColgp_HSequenceOfXYZ
+TColgp_SequenceOfArray1OfPnt2d
+TColgp_SequenceOfAx1
+TColgp_SequenceOfDir
+TColgp_SequenceOfDir2d
+TColgp_SequenceOfPnt
+TColgp_SequenceOfPnt2d
+TColgp_SequenceOfVec
+TColgp_SequenceOfVec2d
+TColgp_SequenceOfXY
+TColgp_SequenceOfXYZ
+TColQuantity_Array1OfLength
+TColQuantity_Array2OfLength
+TColQuantity_HArray1OfLength
+TColQuantity_HArray2OfLength
+TColStd_Array1OfAsciiString
+TColStd_Array1OfBoolean
+TColStd_Array1OfByte
+TColStd_Array1OfCharacter
+TColStd_Array1OfExtendedString
+TColStd_Array1OfInteger
+TColStd_Array1OfListOfInteger
+TColStd_Array1OfReal
+TColStd_Array1OfTransient
+TColStd_Array2OfBoolean
+TColStd_Array2OfCharacter
+TColStd_Array2OfInteger
+TColStd_Array2OfReal
+TColStd_Array2OfTransient
+TColStd_DataMapOfAsciiStringInteger
+TColStd_DataMapOfIntegerInteger
+TColStd_DataMapOfIntegerListOfInteger
+TColStd_DataMapOfIntegerReal
+TColStd_DataMapOfIntegerTransient
+TColStd_DataMapOfStringInteger
+TColStd_DataMapOfTransientTransient
+TColStd_HArray1OfAsciiString
+TColStd_HArray1OfBoolean
+TColStd_HArray1OfByte
+TColStd_HArray1OfCharacter
+TColStd_HArray1OfExtendedString
+TColStd_HArray1OfInteger
+TColStd_HArray1OfListOfInteger
+TColStd_HArray1OfReal
+TColStd_HArray1OfTransient
+TColStd_HArray2OfBoolean
+TColStd_HArray2OfCharacter
+TColStd_HArray2OfInteger
+TColStd_HArray2OfReal
+TColStd_HArray2OfTransient
+TColStd_HSequenceOfAsciiString
+TColStd_HSequenceOfExtendedString
+TColStd_HSequenceOfHAsciiString
+TColStd_HSequenceOfHExtendedString
+TColStd_HSequenceOfInteger
+TColStd_HSequenceOfReal
+TColStd_HSequenceOfTransient
+TColStd_IndexedDataMapOfTransientTransient
+TColStd_IndexedMapOfInteger
+TColStd_IndexedMapOfReal
+TColStd_IndexedMapOfTransient
+TColStd_ListOfAsciiString
+TColStd_ListOfInteger
+TColStd_ListOfReal
+TColStd_ListOfTransient
+TColStd_MapIntegerHasher
+TColStd_MapOfAsciiString
+TColStd_MapOfInteger
+TColStd_MapOfReal
+TColStd_MapOfTransient
+TColStd_MapRealHasher
+TColStd_MapTransientHasher
+TColStd_SequenceOfAddress
+TColStd_SequenceOfAsciiString
+TColStd_SequenceOfBoolean
+TColStd_SequenceOfExtendedString
+TColStd_SequenceOfHAsciiString
+TColStd_SequenceOfHExtendedString
+TColStd_SequenceOfInteger
+TColStd_SequenceOfReal
+TColStd_SequenceOfTransient
+TDataStd_DataMapOfStringByte
+TDataStd_DataMapOfStringHArray1OfInteger
+TDataStd_DataMapOfStringHArray1OfReal
+TDataStd_DataMapOfStringReal
+TDataStd_DataMapOfStringString
+TDataStd_HLabelArray1
+TDataStd_LabelArray1
+TDataStd_ListOfByte
+TDataStd_ListOfExtendedString
+TDataXtd_Array1OfTrsf
+TDataXtd_HArray1OfTrsf
+TDF_AttributeArray1
+TDF_AttributeDataMap
+TDF_AttributeDeltaList
+TDF_AttributeDoubleMap
+TDF_AttributeIndexedMap
+TDF_AttributeList
+TDF_AttributeMap
+TDF_AttributeSequence
+TDF_DeltaList
+TDF_GUIDProgIDMap
+TDF_HAttributeArray1
+TDF_IDList
+TDF_IDMap
+TDF_LabelDataMap
+TDF_LabelDoubleMap
+TDF_LabelIndexedMap
+TDF_LabelIntegerMap
+TDF_LabelList
+TDF_LabelMap
+TDF_LabelSequence
+TDocStd_LabelIDMapDataMap
+TDocStd_SequenceOfApplicationDelta
+TDocStd_SequenceOfDocument
+TestTopOpeDraw_Array1OfDrawableMesure
+TestTopOpeDraw_Array1OfDrawableP3D
+TestTopOpeDraw_HArray1OfDrawableMesure
+TestTopOpeDraw_HArray1OfDrawableP3D
+TestTopOpeDraw_ListOfPnt2d
+TestTopOpeTools_Array1OfMesure
+TestTopOpeTools_HArray1OfMesure
+TFunction_Array1OfDataMapOfGUIDDriver
+TFunction_DataMapOfGUIDDriver
+TFunction_DataMapOfLabelListOfLabel
+TFunction_DoubleMapOfIntegerLabel
+TFunction_HArray1OfDataMapOfGUIDDriver
+TNaming_DataMapOfShapePtrRefShape
+TNaming_DataMapOfShapeShapesSet
+TNaming_ListOfIndexedDataMapOfShapeListOfShape
+TNaming_ListOfMapOfShape
+TNaming_ListOfNamedShape
+TNaming_MapOfNamedShape
+TNaming_NamedShapeHasher
+TopBas_ListOfTestInterference
+TopLoc_IndexedMapOfLocation
+TopLoc_MapLocationHasher
+TopLoc_MapOfLocation
+TopoDS_ListOfShape
+TopOpeBRep_Array1OfLineInter
+TopOpeBRep_Array1OfVPointInter
+TopOpeBRep_DataMapOfTopolTool
+TopOpeBRep_HArray1OfLineInter
+TopOpeBRep_HArray1OfVPointInter
+TopOpeBRep_ListOfBipoint
+TopOpeBRep_SequenceOfPoint2d
+TopOpeBRepBuild_DataMapOfShapeListOfShapeListOfShape
+TopOpeBRepBuild_IndexedDataMapOfShapeVertexInfo
+TopOpeBRepBuild_ListOfListOfLoop
+TopOpeBRepBuild_ListOfLoop
+TopOpeBRepBuild_ListOfPave
+TopOpeBRepBuild_ListOfShapeListOfShape
+TopOpeBRepDS_Array1OfDataMapOfIntegerListOfInterference
+TopOpeBRepDS_DataMapOfCheckStatus
+TopOpeBRepDS_DataMapOfIntegerListOfInterference
+TopOpeBRepDS_DataMapOfInterferenceListOfInterference
+TopOpeBRepDS_DataMapOfInterferenceShape
+TopOpeBRepDS_DataMapOfShapeListOfShapeOn1State
+TopOpeBRepDS_DataMapOfShapeState
+TopOpeBRepDS_DoubleMapOfIntegerShape
+TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference
+TopOpeBRepDS_IndexedDataMapOfShapeWithState
+TopOpeBRepDS_IndexedDataMapOfVertexPoint
+TopOpeBRepDS_ListOfInterference
+TopOpeBRepDS_MapOfCurve
+TopOpeBRepDS_MapOfIntegerShapeData
+TopOpeBRepDS_MapOfPoint
+TopOpeBRepDS_MapOfShapeData
+TopOpeBRepDS_MapOfSurface
+TopOpeBRepDS_ShapeSurface
+TopOpeBRepTool_DataMapOfOrientedShapeC2DF
+TopOpeBRepTool_DataMapOfShapeface
+TopOpeBRepTool_DataMapOfShapeListOfC2DF
+TopOpeBRepTool_IndexedDataMapOfShapeBox
+TopOpeBRepTool_IndexedDataMapOfShapeBox2d
+TopOpeBRepTool_IndexedDataMapOfShapeconnexity
+TopOpeBRepTool_IndexedDataMapOfSolidClassifier
+TopOpeBRepTool_ListOfC2DF
+TopTools_Array1OfListOfShape
+TopTools_Array1OfShape
+TopTools_Array2OfShape
+TopTools_DataMapOfIntegerListOfShape
+TopTools_DataMapOfIntegerShape
+TopTools_DataMapOfOrientedShapeInteger
+TopTools_DataMapOfOrientedShapeShape
+TopTools_DataMapOfShapeInteger
+TopTools_DataMapOfShapeListOfInteger
+TopTools_DataMapOfShapeListOfShape
+TopTools_DataMapOfShapeReal
+TopTools_DataMapOfShapeSequenceOfShape
+TopTools_DataMapOfShapeShape
+TopTools_HArray1OfListOfShape
+TopTools_HArray1OfShape
+TopTools_HArray2OfShape
+TopTools_HSequenceOfShape
+TopTools_IndexedDataMapOfShapeAddress
+TopTools_IndexedDataMapOfShapeListOfShape
+TopTools_IndexedDataMapOfShapeShape
+TopTools_IndexedMapOfOrientedShape
+TopTools_IndexedMapOfShape
+TopTools_ListOfShape
+TopTools_MapOfOrientedShape
+TopTools_MapOfShape
+TopTools_SequenceOfShape
+TopTrans_Array2OfOrientation
+TPrsStd_DataMapOfGUIDDriver
+Transfer_HSequenceOfBinder
+Transfer_HSequenceOfFinder
+Transfer_SequenceOfBinder
+Transfer_SequenceOfFinder
+TransferBRep_HSequenceOfTransferResultInfo
+TransferBRep_SequenceOfTransferResultInfo
+TShort_Array1OfShortReal
+TShort_Array2OfShortReal
+TShort_HArray1OfShortReal
+TShort_HArray2OfShortReal
+TShort_HSequenceOfShortReal
+TShort_SequenceOfShortReal
+Units_QtsSequence
+Units_QuantitiesSequence
+Units_TksSequence
+Units_TokensSequence
+Units_UnitsSequence
+Units_UtsSequence
+ViewerTest_DoubleMapOfInteractiveAndName
+Visual3d_HSequenceOfLight
+Visual3d_HSequenceOfView
+Visual3d_SequenceOfLight
+Visual3d_SequenceOfView
+XCAFDoc_DataMapOfShapeLabel
+XCAFDoc_GraphNodeSequence
+XCAFPrs_DataMapOfShapeStyle
+XCAFPrs_DataMapOfStyleShape
+XCAFPrs_DataMapOfStyleTransient
+XmlLDrivers_SequenceOfNamespaceDef
+XmlMDF_MapOfDriver
+XmlMDF_TypeADriverMap
+XSDRAWSTLVRML_CoordsMap
+XSDRAWSTLVRML_ElemNodesMap

dox/FILES_HTML.txt

@@ -45,8 +45,7 @@ dev_guides/contribution_workflow/contribution_workflow.md
 dev_guides/git_guide/git_guide.md
 dev_guides/tests/tests.md
 dev_guides/debug/debug.md
-dev_guides/cdl/cdl.md
-dev_guides/wok/wok.md
+dev_guides/upgrade/upgrade.md
 
 dev_guides/building/building.md
 dev_guides/building/3rdparty/3rdparty_windows.md
@@ -60,6 +59,4 @@ dev_guides/building/code_blocks.md
 dev_guides/building/msvc.md
 dev_guides/building/xcode.md
 
-dev_guides/upgrade/upgrade.md
-
 license.md

dox/FILES_PDF.txt

@@ -28,7 +28,6 @@ dev_guides/documentation/documentation.md
 dev_guides/contribution/coding_rules.md
 dev_guides/git_guide/git_guide.md
 dev_guides/tests/tests.md
-dev_guides/wok/wok.md
-dev_guides/cdl/cdl.md
+dev_guides/upgrade/upgrade.md
 
 tutorial/tutorial.md

dox/dev_guides/dev_guides.md

@@ -11,12 +11,6 @@ The following documents provide information on OCCT building, development and te
 * @subpage occt_dev_guides__tests "Automatic Testing system"
 * @subpage occt_dev_guides__debug "Debugging tools and hints"
 
-These two documents provide details on obsolete technologies used by OCCT, 
-to be removed in future releases:
-
-* @subpage occt_dev_guides__wok "Workshop Organization Kit (WOK)"
-* @subpage occt_dev_guides__cdl "Component Definition Language (CDL)"
-
 The following guide provides information relevant to upgrading applications developed with previous versions of OCCT, to recent one:
 
 * @subpage occt_dev_guides__upgrade "Upgrade from previous OCCT versions"

dox/dev_guides/upgrade/upgrade.md

@@ -3,18 +3,35 @@ Upgrade from older OCCT versions  {#occt_dev_guides__upgrade}
 
 @tableofcontents
 
-@section occt_upgrade_intro Introduction
+@section upgrade_intro Introduction
 
-This document provides technical details on upgrading user applications using previous versions of OCCT, to the current one.
+This document provides technical details on changes made in particular versions of OCCT, and is aimed to help upgrading user applications based on previous versions of OCCT to newer ones.
 
-@subsection occt_upgrade_700 Upgrade to OCCT 7.0.0
+@subsection upgrade_intro_precautions Precautions
 
-@subsubsection occt_upgrade_700_persist Removal of legacy persistence
+Back-up your code before upgrade.
+We strongly recommend using version control system during upgrade process, saving one or several commits for each step of upgrade, until overall result is verified.
+This will facilitate identification and correction of possible problems that can occur on intermediate steps of upgrade.
+Carefully document each step to be able to repeat it if necessary.
+
+@subsection upgrade_intro_disclaim Disclaimer
+
+This document describes known issues that have been encountered in porting of OCCT and some applications, and approaches that helped to resolve these issues in known cases.
+It does not pretend to cover all possible migration issues that can appear in your application.
+Please take this document with discretion; apply your expertise and knowledge of your application to ensure correct result. 
+
+The automatic upgrade tool is provided as-is, without warranty of any kind, and we explicitly disclaim any liability for possible errors that may appear due to use of this tool. 
+It is your responsibility to ensure that the changes you made in your code are correct. 
+When upgrading your code by automatic script, make sure to carefully review the changes made by it, on each step, before committing them.
+
+@section upgrade_700 Upgrade to OCCT 7.0.0
+
+@subsection upgrade_700_persist Removal of legacy persistence
 
 Legacy persistence for shapes and OCAF data based on Storage_Schema (toolkits TKShapeShcema, TLStdLSchema, TKStdSchema, TKXCAFSchema) has been removed in OCCT 7.0.0.
 Applications that used these persistence tools for their data need to be updated to use other persistence mechanisms.
 
-The existing data files in standard formats can be converted using OCCT 6.9.0 or previous, as follows.
+The existing data files in standard formats can be converted using OCCT 6.9.0 or previous version, as follows.
 
 #### CSFDB files
 
@@ -55,3 +72,316 @@ For that, start *DRAWEXE* and perform the following commands:
 On Windows, be careful to replace back slashes in the file path by either direct slash or pairs of back slashes.
 Use "XmlOcaf" or "XmlXCAF" instead of "BinOcaf" and "BinXCAF", respectively, to save in XML format instead of binary one.
 
+@subsection upgrade_occt700_cdl Removal of CDL and WOK
+
+OCCT code has been completely refactored in version 7.0 to get rid of obsolete technologies used since its inception: CDL (Cas.Cade Definition Language) and WOK (Workshop Organization Kit).
+C++ code previously generated by WOK from CDL declarations is now included directly in OCCT sources.
+
+This modification did not change names, API, and behavior of existing OCCT classes, thus in general the code based on OCCT 6.x should compile and work fine with OCCT 7.0.
+However, due to redesign of basic mechanisms (CDL generic classes, Handles and RTTI) using C++ templates, some changes may be necessary in the code when porting to OCCT 7.0, as described below.
+
+WOK is not necessary anymore for building OCCT from sources, though it still can be used in traditional way -- auxiliary files required for that are preserved.
+The recommended method for building OCCT 7.x is CMake, see @ref occt_dev_guides__building_cmake.
+Alternative solution is to use legacy generator of project files (extracted from WOK), see @ref occt_dev_guides__building_wok.
+
+@subsubsection upgrade_occt700_cdl_auto Automatic upgrade
+
+Most of typical changes required for upgrading code to use OCCT 7.0 can be done automatically using the *upgrade* tool included in OCCT 7.0.
+This tool is a Tcl script, thus Tcl should be available on your workstation to run it.
+
+Example:
+~~~~~
+ $ tclsh
+ % source <path_to_occt>/adm/upgrade.tcl
+ % upgrade -recurse -all -src=<path_to_your_sources>
+~~~~~
+
+On Windows, helper batch script upgrade.bat can be used, provided that Tcl is either available in PATH, or configured via custom.bat script (for instance, if you use OCCT installed from Windows installer package). Start it from command prompt:
+
+~~~~~
+cmd> <path_to_occt>\upgrade.bat -recurse -all -inc=<path_to_occt>\inc -src=<path_to_your_sources> [options]
+~~~~~
+
+Run upgrade tool without arguments to see the list of available options.
+
+Upgrade tool performs the following changes in the code.
+
+1. Adds second argument to macro DEFINE_STANDARD_RTTI indicating base class for its argument class (if inheritance is recognized by the script):
+~~~~~
+DEFINE_STANDARD_RTTI(Class) -> DEFINE_STANDARD_RTTI(Class, Base)
+~~~~~
+
+2. Replaces forward declarations of collection classes previously generated from CDL generics (defined in TCollection package) by \#include of corresponding header:
+~~~~~
+class TColStd_Array1OfReal; -> #include <TColStd_Array1OfReal.hxx>
+~~~~~
+
+3. Replaces underscored names of Handle classes by usage of a macro:
+~~~~~
+Handle_Class -> Handle(Class)
+~~~~~
+  This change is not applied if source or header file is recognized as containing definition of Qt class with signals or slots, to avoid possible compilation errors of MOC files caused by inability of MOC to recognize macros (see http://doc.qt.io/qt-4.8/signalsandslots.html).
+  The file is considered as defining Qt object if it contains strings "Q_OBJECT" and either "slots:" or "signals". 
+
+4. Removes forward declarations of classes with names Handle(C) or Handle_C, replacing these either by forward declaration of its argument class, or (for files defining Qt objects) \#include statement for header with name of the argument class and extension .hxx:
+~~~~~
+class Handle(TColStd_HArray1OfReal); -> #include <TColStd_HArray1OfReal.hxx>
+~~~~~
+
+5. Removes \#includes of files Handle_...hxx disappeared in OCCT 7.0:
+~~~~~
+#include <Handle_Geom_Curve.hxx> ->
+~~~~~
+
+6. Removes typedef statements that use Handle macro to generate name:
+~~~~~
+typedef NCollection_Handle<Message_Msg> Handle(Message_Msg); ->
+~~~~~
+
+7. Converts C-style casts applied to Handles to calls to DownCast() method:
+~~~~~
+    ((Handle(A)&)b)     -> Handle(A)::DownCast(b)
+    (Handle(A)&)b       -> Handle(A)::DownCast(b)
+    (*((Handle(A)*)&b)) -> Handle(A)::DownCast(b)
+    *((Handle(A)*)&b)   -> Handle(A)::DownCast(b)
+    (*(Handle(A)*)&b)   -> Handle(A)::DownCast(b)
+~~~~~
+
+8. Moves Handle() macro out of namespace scope:
+~~~~~
+Namespace::Handle(Class) -> Handle(Namespace::Class)
+~~~~~
+
+9. Converts local variables of reference type initialized by temporary object returned by call to DownCast(), to non-references (to avoid using reference to destroyed memory):
+~~~~~
+    const Handle(A)& a = Handle(B)::DownCast (b); -> Handle(A) a (Handle(B)::DownCast (b));
+~~~~~
+
+10. Adds \#include for all classes used as argument to macro STANDARD_TYPE(), except of already included ones;
+
+11. Removes uses of obsolete macros IMPLEMENT_DOWNCAST() and IMPLEMENT_STANDARD_*().
+
+  > If you plan to keep compatibility of your code with older versions of OCCT, add option "-compat" to avoid the latter change. See also @ref upgrade_occt700_cdl_compat.
+
+As long as the upgrade routine runs, some information messages are sent to the standard output. 
+In some cases the warnings or errors like the following may appear:
+
+~~~~~
+  Error in {HEADER_FILE}: Macro DEFINE_STANDARD_RTTI used for class {CLASS_NAME} whose declaration is not found in this file, cannot fix
+~~~~~
+
+Be sure to check carefully all reported errors and warnings, as corresponding places likely will require manual corrections.
+In some cases these messages may help you to detect errors in your code, for instance, cases where DEFINE_STANDARD_RTTI macro passes invalid class name as an argument.
+
+@subsubsection upgrade_occt700_cdl_compiler Possible compiler errors
+
+Some situations requiring upgrade cannot be detected and / or handled by automatic procedure.
+If you get compiler errors or warnings when trying to build upgraded code, you will need to fix them manually. 
+The following paragraphs list known situations of this kind.
+
+#### Missing header files
+
+Use of handle objects (construction, comparison using operators == or !=, use of function STANDRAD_TYPE() and method DownCast()) now requires the type of the object pointed by Handle to be completely known at compile time. Thus it may be necessary to include header of the corresponding class to make the code compilable.
+
+For example, the following lines will fail to compile if Geom_Line.hxx is not included:
+
+~~~~~
+Handle(Geom_Line) aLine = 0;
+if (aLine != aCurve) {...} 
+if (aCurve->IsKind(STANDARD_TYPE(Geom_Line)) {...}
+aLine = Handle(Geom_Line)::DownCast (aCurve);
+~~~~~
+
+Note that it is not necessary to include header of the class to declare Handle to it.
+However, if you define a class *B* that uses Handle(*A*) in its fields, or contains a method returning Handle(*A*), it is advisable to have header defining *A* included in the header of *B*.
+This will eliminate the need to include the header *A* in each source file where class *B* is used.
+
+#### Ambiguity of calls to overloaded functions
+
+This issue appears in compilers that do not support default arguments in template functions (known cases are Visual C++ 10 and 11): compiler reports ambiguity error if handle is used in argument of call to function that has two or move overloaded versions, accepting handles to different types. 
+The problem is that operator const handle<T2>& is defined for any type T2, thus compiler cannot make a right choice.
+
+Example:
+~~~~~
+void func (const Handle(Geom_Curve)&);
+void func (const Handle(Geom_Surface)&);
+
+Handle(Geom_TrimmedCurve) aCurve = new Geom_TrimmedCurve (...);
+func (aCurve); // ambiguity error in VC++ 10
+~~~~~
+
+To resolve this ambiguity, change your code so that argument type corresponds exactly to the function signature. 
+In some cases this can be done by using relevant type for the corresponding variable, like in the example above:
+
+~~~~~
+Handle(Geom_Curve) aCurve = new Geom_TrimmedCurve (...);  
+~~~~~
+
+Other variants are assigning the argument to local variable of correct type, using direct cast or constructor:
+
+~~~~~
+const Handle(Geom_Curve)& aGCurve (aTrimmedCurve);
+func (aGCurve); // OK - argument has exact type
+func (static_cast(aCurve)); // OK - direct cast 
+func (Handle(Geom_Curve)(aCurve)); // OK - temporary handle is constructed
+~~~~~
+
+Another possibility is defining additional templated variant of the overloaded function causing ambiguity, and use SFINAE to resolve the ambiguity.
+For example of this technique, see definition of the template variant of the method IGESData_IGESWriter::Send().
+
+#### Lack of implicit cast to base type
+
+Due to the fact that now cast of handle to reference to handle to the base type is user-defined operation, conversions that require this cast combined with other user-defined cast will not be resolved automatically by compiler.
+
+For example:
+
+~~~~~
+Handle(Geom_Geometry) aC = GC_MakeLine (p, v); // compiler error
+~~~~~
+
+The problem here is that class GCE2d_MakeSegment has user-defined conversion to const Handle(Geom_TrimmedCurve)&, which is not the same as type of the local variable aC.
+
+To resolve this, use method Value():
+
+~~~~~
+Handle(Geom_Geometry) aC = GC_MakeLine (p, v).Value(); // ok
+~~~~~
+
+or use variable of appropriate type:
+
+~~~~~
+Handle(Geom_TrimmedCurve) aC = GC_MakeLine (p, v); // ok
+~~~~~
+
+#### Incorrect use of STANDARD_TYPE and Handle macros
+
+You might need to clean your code from incorrect use of macros *STANDARD_TYPE*() and *Handle*().
+
+1. Explicit definitions of static functions with names generated by macro STANDARD_TYPE(), which are artifacts of old implementation of RTTI, should be removed.
+   
+   Example:
+~~~~~
+const Handle(Standard_Type)& STANDARD_TYPE(math_GlobOptMin)
+{
+  static Handle(Standard_Type) _atype = new Standard_Type ("math_GlobOptMin", sizeof (math_GlobOptMin));
+  return _atype;
+}
+~~~~~
+
+2. Incorrect location of closing parenthesis of Handle() macro that was not detectable in OCCT 6.x will cause compiler error and must be corrected.
+
+   Example (note misplaced closing parenthesis):
+~~~~~
+aBSpline = Handle( Geom2d_BSplineCurve::DownCast(BS->Copy()) );
+~~~~~
+
+#### Use of class Standard_AncestorIterator
+
+Class Standard_AncestorIterator has been removed; use method Parent() of Standard_Type class to parse inheritance chain.
+
+#### Absence of cast to Standard_Transient*
+
+Handles in OCCT 7.0 do not have operator of conversion to Standard_Transient*, which was present in earlier versions.
+This is done to prevent possible unintended errors like this:
+
+~~~~~
+Handle(Geom_Line) aLine = ...;
+Handle(Geom_Surface) aSurf = ...;
+...
+if (aLine == aSurf) {...} // will cause compiler error in OCCT 7.0, but not OCCT 6.x
+~~~~~
+
+Places where this implicit cast has been used should be corrected manually.
+The typical situation is when Handle is passed to stream:
+
+~~~~~
+Handle(Geom_Line) aLine = ...;
+os << aLine; // in OCCT 6.9.0, resolves to operator << (void*) 
+~~~~~
+
+Call method get() explicitly to output address of the Handle.
+
+@subsubsection upgrade_occt700_cdl_runtime Possible runtime problems
+
+Known situations when problems are possible at run time after upgrade to OCCT 7.0 are listed here.
+
+#### References to temporary objects
+
+In previous versions, compiler was able to detect situation when local variable of reference type to Handle is initialized by temporary object, and ensured that lifetime of that object is longer than that of the variable. 
+Since OCCT 7.0, it will not work if types of the temporary object and variable are different (due to involvement of user-defined type cast), thus such temporary object will be destroyed immediately.
+
+Example:
+
+~~~~~
+// note that DownCast() returns new temporary object!
+const Handle(Geom_BoundedCurve)& aBC =
+Handle(Geom_TrimmedCurve)::DownCast(aCurve);
+aBC->Transform (T); // access violation in OCCT 7.0
+~~~~~
+
+@subsubsection upgrade_occt700_cdl_compat Preserving compatibility with OCCT 6.x
+
+If you like to preserve compatibility of your application code with OCCT versions 6.x even after upgrade to 7.0, consider the following suggestions:
+
+1. When running automatic upgrade tool, add option *-compat*.
+
+2. In order to overcome incompatibility of macro DEFINE_STANDARD_RTTI which has additional argument in OCCT 7.0, you can replace (after upgrade) its use in your code by your own version-dependent macro, which resolves to either 6.x or 7.x version.
+
+   Example:
+~~~~~   
+#if OCC_VERSION_HEX < 0x070000
+  #define DEFINE_STANDARD_RTTI_COMPAT(C1,C2) DEFINE_STANDARD_RTTI(C1) 
+#else
+  #define DEFINE_STANDARD_RTTI_COMPAT(C1,C2) DEFINE_STANDARD_RTTI(C1,C2) 
+#endif
+~~~~~
+
+@subsubsection upgrade_occt700_cdl_wok Applications based on CDL and WOK
+
+If you have application essentially based on CDL, and need to upgrade it to OCCT 7.0, you will very likely need to convert your application code to non-CDL form.
+This is non-trivial effort; the required actions would depend strongly on the structure of the code and used features of CDL.
+
+The upgrade script and sources of specialized version of WOK used for upgrading OCCT code can be found in WOK Git repository in branch [CR0_700_2](http://git.dev.opencascade.org/gitweb/?p=occt-wok.git;a=log;h=refs/heads/CR0_700_2).
+
+[Contact us](http://www.opencascade.com/contact/) if you need more help.
+
+@subsection upgrade_occt700_bspline Separation of BSpline cache
+
+Implementation of NURBS curves and surfaces has been revised: cache of polynomial coefficients, used to accelerate calculate values of B-spline, is separated from data objects (Geom2d_BSplineCurve, Geom_BSplineCurve, Geom_BSplineSurface), into dedicated classes (BSplCLib_Cache and BSplSLib_Cache). 
+
+The benefits of this change are:
+
+* Reduced memory footprint of OCCT shapes (up to 20% on some cases)
+* Possibility to evaluate the same B-Spline concurrently in parallel threads without data races and mutex locks 
+
+The drawback is that direct evaluation of B-Splines using methods of curves and surfaces becomes slower, due to absence of cache. The way to avoid slow down is to use adaptor classes (Geom2dAdaptor_Curve, GeomAdaptor_Curve and GeomAdaptor_Surface): they now use cache when the curve or surface is a B-spline.
+
+OCCT algorithms are changed to use adaptors for B-spline calculations instead of direct methods of curves and surfaces.
+The same changes (use of adaptors instead of direct call to curve and surface methods) should be implemented in relevant places in applications based on OCCT in order to get maximum performance.
+
+@subsection upgrade_occt700_sorttools Removal of SortTools package
+
+Package SortTools has been removed. 
+The code that used the tools provided by that package should be corrected manually.
+The recommended approach is to use sorting algorithms provided by STL.
+
+For instance:
+~~~~~
+#include <SortTools_StraightInsertionSortOfReal.hxx>
+#include <SortTools_ShellSortOfReal.hxx>
+#include <TCollection_CompareOfReal.hxx>
+...
+TCollection_Array1OfReal aValues = ...;
+...
+TCollection_CompareOfReal aCompReal;
+SortTools_StraightInsertionSortOfReal::Sort(aValues, aCompReal);
+~~~~~
+can be replaced by:
+~~~~~
+#include <algorithm>
+...
+TCollection_Array1OfReal aValues = ...;
+...
+std::stable_sort (aValues->begin(), aValues->end());
+~~~~~
+

gendoc.bat

@@ -15,7 +15,7 @@ set "TCL_EXEC=tclsh.exe"
 for %%X in (%TCL_EXEC%) do (set TCL_FOUND=%%~$PATH:X)
 
 if defined TCL_FOUND (
-  %TCL_EXEC% %~dp0adm/start.tcl  %*
+  %TCL_EXEC% %~dp0adm/start.tcl gendoc %*
 ) else (
   echo "Error. %TCL_EXEC% is not found. Please update PATH variable"
 )

genproj.bat

@@ -5,15 +5,26 @@ rem Running it requires that Tcl should be in the PATH
 
 SET "OLD_PATH=%PATH%"
 
-if not exist "%~dp0custom.bat" (
-  tclsh.exe ./adm/genconf.tcl
+if exist "%~dp0env.bat" (
+  call "%~dp0env.bat"
+)
+
+set "TCL_EXEC=tclsh.exe"
+
+for %%X in (%TCL_EXEC%) do (set TCL_FOUND=%%~$PATH:X)
+
+if not defined TCL_FOUND (
+  echo "Error. %TCL_EXEC% is not found. Please update PATH variable"
+  goto :eof
 )
 
 if not exist "%~dp0custom.bat" (
-  echo custom.bat is not created. Run the script again and generate custom.bat
+  %TCL_EXEC% %~dp0adm/genconf.tcl
+)
+
+if not exist "%~dp0custom.bat" (
+  echo custom.bat is not created. Run the script again or create custom.bat manually
   goto :eof
-) else (
-  call "%~dp0custom.bat"
 )
 
 if exist "%~dp0env.bat" (
@@ -21,5 +32,5 @@ if exist "%~dp0env.bat" (
 )
 
 cd %~dp0
-tclsh.exe ./adm/genproj.tcl -path=. -target=%VCVER% 
+%TCL_EXEC% %~dp0adm/start.tcl genproj -path=. -target=%VCVER%
 SET "PATH=%OLD_PATH%"

src/Adaptor2d/Adaptor2d_HCurve2d.hxx

@@ -34,15 +34,12 @@
 #include <gp_Elips2d.hxx>
 #include <gp_Hypr2d.hxx>
 #include <gp_Parab2d.hxx>
-class Standard_OutOfRange;
-class Standard_NoSuchObject;
-class Standard_DomainError;
-class Standard_NotImplemented;
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
+
 class Adaptor2d_Curve2d;
 class gp_Pnt2d;
 class gp_Vec2d;
-class Geom2d_BezierCurve;
-class Geom2d_BSplineCurve;
 
 
 class Adaptor2d_HCurve2d;
@@ -122,27 +119,9 @@ public:
     virtual Handle(Geom2d_BSplineCurve) BSpline() const;
 
 
-
-
   DEFINE_STANDARD_RTTI(Adaptor2d_HCurve2d,MMgt_TShared)
-
-protected:
-
-
-
-
-private:
-
-
-
-
 };
 
-
 #include <Adaptor2d_HCurve2d.lxx>
 
-
-
-
-
 #endif // _Adaptor2d_HCurve2d_HeaderFile

src/Approx/Approx_Curve2d.hxx

@@ -21,13 +21,10 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Standard_Integer.hxx>
-class Geom2d_BSplineCurve;
-class Adaptor2d_HCurve2d;
+#include <Geom2d_BSplineCurve.hxx>
 
+class Adaptor2d_HCurve2d;
 
 //! Makes  an  approximation  for  HCurve2d  from  Adaptor3d
 class Approx_Curve2d 
@@ -49,32 +46,14 @@ public:
   
   Standard_EXPORT Standard_Real MaxError2dV() const;
 
-
-
-
-protected:
-
-
-
-
-
 private:
 
-
-
   Handle(Geom2d_BSplineCurve) myCurve;
   Standard_Boolean myIsDone;
   Standard_Boolean myHasResult;
   Standard_Real myMaxError2dU;
   Standard_Real myMaxError2dV;
 
-
 };
 
-
-
-
-
-
-
 #endif // _Approx_Curve2d_HeaderFile

src/Approx/Approx_Curve3d.hxx

@@ -21,18 +21,11 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_OStream.hxx>
-class Geom_BSplineCurve;
-class Standard_OutOfRange;
-class Standard_ConstructionError;
+#include <Geom_BSplineCurve.hxx>
+
 class Adaptor3d_HCurve;
 
-
-
 class Approx_Curve3d 
 {
 public:
@@ -62,31 +55,13 @@ public:
   //! Print on the stream  o  information about the object
   Standard_EXPORT void Dump (Standard_OStream& o) const;
 
-
-
-
-protected:
-
-
-
-
-
 private:
 
-
-
   Standard_Boolean myIsDone;
   Standard_Boolean myHasResult;
   Handle(Geom_BSplineCurve) myBSplCurve;
   Standard_Real myMaxError;
 
-
 };
 
-
-
-
-
-
-
 #endif // _Approx_Curve3d_HeaderFile

src/BRep/BRep_Tool.hxx

@@ -21,25 +21,21 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Integer.hxx>
 #include <GeomAbs_Shape.hxx>
-class Standard_NullObject;
-class Standard_NoSuchObject;
+#include <Geom_Surface.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom2d_Curve.hxx>
+#include <gp_Pnt2d.hxx>
+#include <gp_Pnt.hxx>
+#include <Poly_Triangulation.hxx>
+#include <Poly_Polygon3D.hxx>
+#include <Poly_Polygon2D.hxx>
+#include <Poly_PolygonOnTriangulation.hxx>
+
 class TopoDS_Shape;
-class Geom_Surface;
 class TopoDS_Face;
 class TopLoc_Location;
-class Poly_Triangulation;
 class TopoDS_Edge;
-class Geom_Curve;
-class Poly_Polygon3D;
-class Geom2d_Curve;
-class Poly_Polygon2D;
-class Poly_PolygonOnTriangulation;
-class gp_Pnt2d;
-class gp_Pnt;
 class TopoDS_Vertex;
 
 
@@ -241,27 +237,6 @@ public:
   //! Returns the parameters of the vertex on the face.
   Standard_EXPORT static gp_Pnt2d Parameters (const TopoDS_Vertex& V, const TopoDS_Face& F);
 
-
-
-
-protected:
-
-
-
-
-
-private:
-
-
-
-
-
 };
 
-
-
-
-
-
-
 #endif // _BRep_Tool_HeaderFile

src/GC/GC_MakeArcOfCircle.hxx

@@ -22,10 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom_TrimmedCurve;
-class StdFail_NotDone;
+#include <Geom_TrimmedCurve.hxx>
+
 class gp_Circ;
 class gp_Pnt;
 class gp_Vec;
@@ -88,30 +86,12 @@ public:
   //! Returns the constructed arc of circle.
   //! Exceptions StdFail_NotDone if no arc of circle is constructed.
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
-operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_TrimmedCurve) TheArc;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeArcOfCircle_HeaderFile

src/GC/GC_MakeArcOfEllipse.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom_TrimmedCurve;
+#include <Geom_TrimmedCurve.hxx>
+
 class StdFail_NotDone;
 class gp_Elips;
 class gp_Pnt;
@@ -65,30 +64,12 @@ public:
   
   //! Returns the constructed arc of ellipse.
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
-operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_TrimmedCurve) TheArc;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeArcOfEllipse_HeaderFile

src/GC/GC_MakeArcOfHyperbola.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom_TrimmedCurve;
+#include <Geom_TrimmedCurve.hxx>
+
 class StdFail_NotDone;
 class gp_Hypr;
 class gp_Pnt;
@@ -63,30 +62,13 @@ public:
   
   //! Returns the constructed arc of hyperbola.
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
-operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_TrimmedCurve) TheArc;
-
-
 };
 
 
-
-
-
-
-
 #endif // _GC_MakeArcOfHyperbola_HeaderFile

src/GC/GC_MakeArcOfParabola.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom_TrimmedCurve;
+#include <Geom_TrimmedCurve.hxx>
+
 class StdFail_NotDone;
 class gp_Parab;
 class gp_Pnt;
@@ -60,30 +59,12 @@ public:
   
   //! Returns the constructed arc of parabola.
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
-operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_TrimmedCurve) TheArc;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeArcOfParabola_HeaderFile

src/GC/GC_MakeCircle.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom_Circle;
+#include <Geom_Circle.hxx>
+
 class StdFail_NotDone;
 class gp_Circ;
 class gp_Ax2;
@@ -99,30 +99,12 @@ public:
   //! Exceptions
   //! StdFail_NotDone if no circle is constructed.
   Standard_EXPORT const Handle(Geom_Circle)& Value() const;
-operator const Handle(Geom_Circle)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_Circle)& () const { return Value(); }
+  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_Circle) TheCircle;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeCircle_HeaderFile

src/GC/GC_MakeConicalSurface.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom_ConicalSurface;
+#include <Geom_ConicalSurface.hxx>
+
 class StdFail_NotDone;
 class gp_Ax2;
 class gp_Cone;
@@ -123,30 +123,12 @@ public:
   //! Exceptions
   //! StdFail_NotDone if no cone is constructed.
   Standard_EXPORT const Handle(Geom_ConicalSurface)& Value() const;
-operator const Handle(Geom_ConicalSurface)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_ConicalSurface)& () const { return Value(); }
+  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_ConicalSurface) TheCone;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeConicalSurface_HeaderFile

src/GC/GC_MakeCylindricalSurface.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom_CylindricalSurface;
+#include <Geom_CylindricalSurface.hxx>
+
 class StdFail_NotDone;
 class gp_Ax2;
 class gp_Cylinder;
@@ -111,30 +111,12 @@ public:
   //! Returns the constructed cylinder.
   //! Exceptions StdFail_NotDone if no cylinder is constructed.
   Standard_EXPORT const Handle(Geom_CylindricalSurface)& Value() const;
-operator const Handle(Geom_CylindricalSurface)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_CylindricalSurface)& () const { return Value(); }
+  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_CylindricalSurface) TheCylinder;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeCylindricalSurface_HeaderFile

src/GC/GC_MakeEllipse.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom_Ellipse;
+#include <Geom_Ellipse.hxx>
+
 class StdFail_NotDone;
 class gp_Elips;
 class gp_Ax2;
@@ -77,30 +77,12 @@ public:
   //! Returns the constructed ellipse.
   //! Exceptions StdFail_NotDone if no ellipse is constructed.
   Standard_EXPORT const Handle(Geom_Ellipse)& Value() const;
-operator const Handle(Geom_Ellipse)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_Ellipse)& () const { return Value(); }
+  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_Ellipse) TheEllipse;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeEllipse_HeaderFile

src/GC/GC_MakeHyperbola.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom_Hyperbola;
+#include <Geom_Hyperbola.hxx>
+
 class StdFail_NotDone;
 class gp_Hypr;
 class gp_Ax2;
@@ -87,30 +87,12 @@ public:
   //! Returns the constructed hyperbola.
   //! Exceptions StdFail_NotDone if no hyperbola is constructed.
   Standard_EXPORT const Handle(Geom_Hyperbola)& Value() const;
-operator const Handle(Geom_Hyperbola)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_Hyperbola)& () const { return Value(); }
+  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_Hyperbola) TheHyperbola;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeHyperbola_HeaderFile

src/GC/GC_MakeLine.hxx

@@ -22,7 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-class Geom_Line;
+#include <Geom_Line.hxx>
+
 class StdFail_NotDone;
 class gp_Ax1;
 class gp_Lin;
@@ -75,30 +76,12 @@ public:
   //! Returns the constructed line.
   //! Exceptions StdFail_NotDone if no line is constructed.
   Standard_EXPORT const Handle(Geom_Line)& Value() const;
-operator const Handle(Geom_Line)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_Line)& () const { return Value(); }
+  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_Line) TheLine;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeLine_HeaderFile

src/GC/GC_MakePlane.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom_Plane;
+#include <Geom_Plane.hxx>
+
 class StdFail_NotDone;
 class gp_Ax2;
 class gp_Pln;
@@ -100,30 +100,12 @@ public:
   //! Returns the constructed plane.
   //! Exceptions StdFail_NotDone if no plane is constructed.
   Standard_EXPORT const Handle(Geom_Plane)& Value() const;
-operator const Handle(Geom_Plane)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_Plane)& () const { return Value(); }
+  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_Plane) ThePlane;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakePlane_HeaderFile

src/GC/GC_MakeSegment.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom_TrimmedCurve;
+#include <Geom_TrimmedCurve.hxx>
+
 class StdFail_NotDone;
 class gp_Pnt;
 class gp_Lin;
@@ -66,30 +66,12 @@ public:
   
   //! Returns the constructed line segment.
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
-operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_TrimmedCurve) TheSegment;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeSegment_HeaderFile

src/GC/GC_MakeTrimmedCone.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom_RectangularTrimmedSurface;
+#include <Geom_RectangularTrimmedSurface.hxx>
+
 class StdFail_NotDone;
 class gp_Pnt;
 
@@ -75,30 +75,12 @@ public:
   //! Returns the constructed trimmed cone.
   //! StdFail_NotDone if no trimmed cone is constructed.
   Standard_EXPORT const Handle(Geom_RectangularTrimmedSurface)& Value() const;
-operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }
+  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_RectangularTrimmedSurface) TheCone;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeTrimmedCone_HeaderFile

src/GC/GC_MakeTrimmedCylinder.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GC_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom_RectangularTrimmedSurface;
+#include <Geom_RectangularTrimmedSurface.hxx>
+
 class StdFail_NotDone;
 class gp_Pnt;
 class gp_Circ;
@@ -93,30 +93,12 @@ public:
   //! Exceptions
   //! StdFail_NotDone if no trimmed cylinder is constructed.
   Standard_EXPORT const Handle(Geom_RectangularTrimmedSurface)& Value() const;
-operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }
+  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom_RectangularTrimmedSurface) TheCyl;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GC_MakeTrimmedCylinder_HeaderFile

src/GCE2d/GCE2d_MakeArcOfCircle.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom2d_TrimmedCurve;
+#include <Geom2d_TrimmedCurve.hxx>
+
 class StdFail_NotDone;
 class gp_Circ2d;
 class gp_Pnt2d;
@@ -73,30 +72,12 @@ public:
   //! Returns the constructed arc of circle.
   //! Exceptions StdFail_NotDone if no arc of circle is constructed.
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
-operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_TrimmedCurve) TheArc;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeArcOfCircle_HeaderFile

src/GCE2d/GCE2d_MakeArcOfEllipse.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom2d_TrimmedCurve;
+#include <Geom2d_TrimmedCurve.hxx>
+
 class StdFail_NotDone;
 class gp_Elips2d;
 class gp_Pnt2d;
@@ -65,30 +64,12 @@ public:
   
   //! Returns the constructed arc of ellipse.
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
-operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_TrimmedCurve) TheArc;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeArcOfEllipse_HeaderFile

src/GCE2d/GCE2d_MakeArcOfHyperbola.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom2d_TrimmedCurve;
+#include <Geom2d_TrimmedCurve.hxx>
+
 class StdFail_NotDone;
 class gp_Hypr2d;
 class gp_Pnt2d;
@@ -64,30 +63,12 @@ public:
   
   //! Returns the constructed arc of hyperbola.
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
-operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_TrimmedCurve) TheArc;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeArcOfHyperbola_HeaderFile

src/GCE2d/GCE2d_MakeArcOfParabola.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom2d_TrimmedCurve;
+#include <Geom2d_TrimmedCurve.hxx>
+
 class StdFail_NotDone;
 class gp_Parab2d;
 class gp_Pnt2d;
@@ -64,30 +63,12 @@ public:
   
   //! Returns the constructed arc of parabola.
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
-operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_TrimmedCurve) TheArc;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeArcOfParabola_HeaderFile

src/GCE2d/GCE2d_MakeCircle.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom2d_Circle;
+#include <Geom2d_Circle.hxx>
+
 class StdFail_NotDone;
 class gp_Circ2d;
 class gp_Ax2d;
@@ -102,30 +101,12 @@ public:
   //! Returns the constructed circle.
   //! Exceptions StdFail_NotDone if no circle is constructed.
   Standard_EXPORT const Handle(Geom2d_Circle)& Value() const;
-operator const Handle(Geom2d_Circle)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_Circle)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_Circle) TheCircle;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeCircle_HeaderFile

src/GCE2d/GCE2d_MakeEllipse.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom2d_Ellipse;
+#include <Geom2d_Ellipse.hxx>
+
 class StdFail_NotDone;
 class gp_Elips2d;
 class gp_Ax2d;
@@ -87,30 +86,12 @@ public:
   //! Returns the constructed ellipse.
   //! Exceptions StdFail_NotDone if no ellipse is constructed.
   Standard_EXPORT const Handle(Geom2d_Ellipse)& Value() const;
-operator const Handle(Geom2d_Ellipse)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_Ellipse)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_Ellipse) TheEllipse;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeEllipse_HeaderFile

src/GCE2d/GCE2d_MakeHyperbola.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom2d_Hyperbola;
+#include <Geom2d_Hyperbola.hxx>
+
 class StdFail_NotDone;
 class gp_Hypr2d;
 class gp_Ax2d;
@@ -107,30 +106,12 @@ public:
   //! Returns the constructed hyperbola.
   //! Exceptions: StdFail_NotDone if no hyperbola is constructed.
   Standard_EXPORT const Handle(Geom2d_Hyperbola)& Value() const;
-operator const Handle(Geom2d_Hyperbola)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_Hyperbola)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_Hyperbola) TheHyperbola;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeHyperbola_HeaderFile

src/GCE2d/GCE2d_MakeLine.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom2d_Line;
+#include <Geom2d_Line.hxx>
+
 class StdFail_NotDone;
 class gp_Ax2d;
 class gp_Lin2d;
@@ -75,30 +75,12 @@ public:
   //! Returns the constructed line.
   //! Exceptions StdFail_NotDone if no line is constructed.
   Standard_EXPORT const Handle(Geom2d_Line)& Value() const;
-operator const Handle(Geom2d_Line)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_Line)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_Line) TheLine;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeLine_HeaderFile

src/GCE2d/GCE2d_MakeParabola.hxx

@@ -22,9 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-class Geom2d_Parabola;
+#include <Geom2d_Parabola.hxx>
+
 class StdFail_NotDone;
 class gp_Parab2d;
 class gp_Ax22d;
@@ -105,30 +104,12 @@ public:
   //! Returns the constructed parabola.
   //! Exceptions StdFail_NotDone if no parabola is constructed.
   Standard_EXPORT const Handle(Geom2d_Parabola)& Value() const;
-operator const Handle(Geom2d_Parabola)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_Parabola)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_Parabola) TheParabola;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeParabola_HeaderFile

src/GCE2d/GCE2d_MakeSegment.hxx

@@ -22,8 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <GCE2d_Root.hxx>
-#include <Standard_Real.hxx>
-class Geom2d_TrimmedCurve;
+#include <Geom2d_TrimmedCurve.hxx>
+
 class StdFail_NotDone;
 class gp_Pnt2d;
 class gp_Dir2d;
@@ -80,30 +80,12 @@ public:
   //! Returns the constructed line segment.
   //! Exceptions StdFail_NotDone if no line segment is constructed.
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
-operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-
-
-
-
-protected:
-
-
-
 
+  operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
+  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
-
-
-
   Handle(Geom2d_TrimmedCurve) TheSegment;
-
-
 };
 
-
-
-
-
-
-
 #endif // _GCE2d_MakeSegment_HeaderFile

src/Geom2dHatch/Geom2dHatch_Hatcher.hxx

@@ -18,29 +18,23 @@
 #define _Geom2dHatch_Hatcher_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
+#include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dHatch_Intersector.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
 #include <Geom2dHatch_Elements.hxx>
 #include <Geom2dHatch_Hatchings.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <HatchGen_ErrorStatus.hxx>
+
 class Standard_NoSuchObject;
 class Standard_OutOfRange;
 class StdFail_NotDone;
 class Geom2dHatch_Intersector;
 class Geom2dHatch_Element;
-class Geom2dAdaptor_Curve;
 class Geom2dHatch_Hatching;
 class HatchGen_PointOnHatching;
 class HatchGen_Domain;
 
-
-
 class Geom2dHatch_Hatcher 
 {
 public:
@@ -97,6 +91,13 @@ public:
   //! Adds an element to the hatcher and returns its index.
   Standard_EXPORT Standard_Integer AddElement (const Geom2dAdaptor_Curve& Curve, const TopAbs_Orientation Orientation = TopAbs_FORWARD);
   
+  //! Adds an element to the hatcher and returns its index.
+  Standard_Integer AddElement (const Handle(Geom2d_Curve)& Curve, const TopAbs_Orientation Orientation = TopAbs_FORWARD)
+  {
+    Geom2dAdaptor_Curve aGAC (Curve);
+    return AddElement (aGAC, Orientation);
+  }
+
   //! Removes the IndE-th element from the hatcher.
   Standard_EXPORT void RemElement (const Standard_Integer IndE);
   

src/GeomAPI/GeomAPI_Interpolate.hxx

@@ -28,9 +28,8 @@
 #include <TColStd_HArray1OfBoolean.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColgp_Array1OfVec.hxx>
-class Geom_BSplineCurve;
-class StdFail_NotDone;
-class Standard_ConstructionError;
+#include <Geom_BSplineCurve.hxx>
+
 class gp_Vec;
 
 

src/IGESData/IGESData_IGESWriter.hxx

@@ -33,6 +33,7 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
+
 class IGESData_IGESModel;
 class Interface_InterfaceMismatch;
 class Interface_FloatWriter;
@@ -43,7 +44,6 @@ class TCollection_HAsciiString;
 class gp_XY;
 class gp_XYZ;
 
-
 //! manages atomic file writing, under control of IGESModel :
 //! prepare text to be sent then sends it
 //! takes into account distinction between successive Sections
@@ -147,7 +147,15 @@ public:
   //! If <val> is Null, "0" will be sent
   //! If <negative> is True, "Pointer" is sent as negative
   Standard_EXPORT void Send (const Handle(IGESData_IGESEntity)& val, const Standard_Boolean negative = Standard_False);
-template <class T> void Send (const Handle(T)& val, Standard_Boolean negative = Standard_False, typename std::enable_if<std::is_base_of<IGESData_IGESEntity, T>::value>::type * = 0) { Send ((const Handle(IGESData_IGESEntity)&)val, negative); }
+
+  //! Helper method to avoid ambiguity of calls to above methods Send() for
+  //! classes derived from IGESData_IGESEntity, for VC++ 10 and 11 compillers
+  template <class T> 
+  void Send (const Handle(T)& val, Standard_Boolean negative = Standard_False, 
+             typename std::enable_if<std::is_base_of<IGESData_IGESEntity, T>::value>::type * = 0)
+  { 
+    Send ((const Handle(IGESData_IGESEntity)&)val, negative);
+  }
   
   //! sends a parameter under its exact form given as a string
   Standard_EXPORT void SendString (const Handle(TCollection_HAsciiString)& val);
@@ -170,18 +178,8 @@ template <class T> void Send (const Handle(T)& val, Standard_Boolean negative =
   //! Takes WriteMode into account
   Standard_EXPORT Standard_Boolean Print (Standard_OStream& S) const;
 
-
-
-
-protected:
-
-
-
-
-
 private:
   
-  
   //! Basic action of adding a string to current parameter list as a
   //! line; manages size limit (64 or 72 according Sestion G or P)
   //! <more>, if precised, requires that <more> characters will
@@ -203,6 +201,8 @@ private:
   Standard_EXPORT void AddChar (const Standard_Character val, const Standard_Integer more = 0);
 
 
+private:
+  
   Handle(IGESData_IGESModel) themodel;
   Handle(TColStd_HSequenceOfHAsciiString) thestar;
   Handle(TColStd_HSequenceOfHAsciiString) thehead;
@@ -216,14 +216,6 @@ private:
   Interface_LineBuffer thecurr;
   Standard_Integer themodew;
   Interface_FloatWriter thefloatw;
-
-
 };
 
-
-
-
-
-
-
 #endif // _IGESData_IGESWriter_HeaderFile

src/QANCollection/QANCollection_Handle.cxx

@@ -87,6 +87,7 @@ static Standard_Integer QAHandleOps (Draw_Interpretor& theDI,
   CHECK(theDI, cpLine == aLine,  "equality of const pointer and handle");
   CHECK(theDI, &rLine == aLine,  "equality of reference and handle");
   CHECK(theDI, &crLine == aLine,  "equality of reference and handle");
+  CHECK(theDI, aLine, "cast to bool");
 
   Handle(Geom_Line) aLin2;
   CHECK(theDI, aLine != aLin2, "inequality of handle to the same type handle");
@@ -120,10 +121,13 @@ static Standard_Integer QAHandleOps (Draw_Interpretor& theDI,
   // currently allowed for compatibility
   gunc (aLine);
   Handle(Geom_Curve)& aCurve2 = aLine; // cast to base non-const ref
-  (void)aCurve2;
 
   Handle(Geom_Line) qLine = cpLine; // constructor from const pointer -- could be made explicit...
 
+  // check whether compiler will destroy reference to temporary handle
+  Handle(Geom_Curve)& aTmpRef (Handle(Geom_Line)::DownCast (aCurve2));
+  CHECK(theDI, ! aTmpRef.IsNull(),  "local reference of handle to base type to temporary handle object");
+
   Handle(Geom_Surface) aSurf;
   (void)aSurf;
 

src/ShapeFix/ShapeFix_Shell.hxx

@@ -18,23 +18,19 @@
 #define _ShapeFix_Shell_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
+#include <Message_ProgressIndicator.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Compound.hxx>
-#include <Standard_Integer.hxx>
 #include <ShapeFix_Root.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeExtend_Status.hxx>
-#include <Standard_Real.hxx>
+
 class ShapeFix_Face;
 class TopoDS_Shell;
-class Message_ProgressIndicator;
 class TopoDS_Shape;
 class TopoDS_Compound;
 class ShapeExtend_BasicMsgRegistrator;
 
-
 class ShapeFix_Shell;
 DEFINE_STANDARD_HANDLE(ShapeFix_Shell, ShapeFix_Root)
 

src/Standard/Standard.hxx

@@ -88,5 +88,8 @@ public:
 
 };
 
+// include definition of handle to make it always visible
+// (put at the and of the file due to cyclic dependency between headers)
+#include <Standard_Transient.hxx>
 
 #endif // _Standard_HeaderFile

src/Standard/Standard_Handle.hxx

@@ -161,6 +161,13 @@ namespace opencascade {
       return left != right.get();
     }
 
+    //! Compare operator for possible use in std::map<> etc. 
+    template <class T2>
+    bool operator< (const handle<T2>& theHandle) const
+    { 
+      return get() < theHandle.get();
+    }
+
     //! Down casting operator
     template <class T2>
     static handle DownCast (const handle<T2>& theObject)
@@ -175,6 +182,25 @@ namespace opencascade {
       return handle (dynamic_cast<T*>(const_cast<T2*>(thePtr)));
     }
 
+#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1800) || (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
+
+    //! Conversion to bool for use in conditional expressions
+    explicit operator bool () const
+    { 
+      return entity != nullptr;
+    }
+
+#else /* fallback version for compilers not supporting explicit conversion operators (VC10, VC11, GCC below 4.5) */
+
+    //! Conversion to bool-compatible type for use in conditional expressions
+    operator Standard_Transient* handle::* () const
+    { 
+      return entity ? &handle::entity : 0;
+    }
+
+#endif
+
+    //! Upcast to const reference to base type.
 #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1800) || (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
 
     //! Upcast to const reference to base type.
@@ -185,7 +211,7 @@ namespace opencascade {
     }
 
     //! Upcast to non-const reference to base type.
-    //! NB: this cast can be dangerous, see #26377
+    //! NB: this cast can be dangerous, but required for legacy code; see #26377
     template <class T2, typename = typename std::enable_if<std::is_base_of<T2, T>::value>::type>
     operator handle<T2>& ()
     {
@@ -207,7 +233,7 @@ namespace opencascade {
     }
 
     //! Upcast to non-const reference to base type.
-    //! NB: this cast can be dangerous, see #26377
+    //! NB: this cast can be dangerous, but required for legacy code; see #26377
     template <class T2>
     operator handle<T2>& ()
     {
@@ -264,7 +290,7 @@ inline Standard_Integer HashCode (const Handle(T)& theHandle, const Standard_Int
 }
 
 //! For compatibility with previous versions of OCCT, defines typedef opencascade::handle<Class> Handle(Class)
-#define DEFINE_STANDARD_HANDLECLASS(C1,C2,BC) typedef Handle(C1) Handle_##C1;
+#define DEFINE_STANDARD_HANDLECLASS(C1,C2,BC) class C1; typedef Handle(C1) Handle_##C1;
 #define DEFINE_STANDARD_HANDLE(C1,C2) DEFINE_STANDARD_HANDLECLASS(C1,C2,Standard_Transient)
 #define DEFINE_STANDARD_PHANDLE(C1,C2) DEFINE_STANDARD_HANDLECLASS(C1,C2,Standard_Persistent)
 

tests/perf/fclasses/handle

@@ -1,4 +1,5 @@
 puts "TODO OCC26471 Linux: Error: OCCT DownCast is expected to be faster!"
+puts "TODO OCC24023 ALL: Checking local reference of handle to base type to temporary handle object"
 
 puts "========"
 puts "CR24023, check operability and performance of OCCT RTTI and handles"

upgrade.bat

@@ -0,0 +1,23 @@
+@echo off
+
+rem Helper script to run procedure of automatic upgrade of application code
+rem on newer version of OCCT on Windows.
+rem Running it requires that Tcl should be in the PATH
+
+SET "OLD_PATH=%PATH%"
+
+if exist "%~dp0env.bat" (
+  call "%~dp0env.bat"
+)
+
+set "TCL_EXEC=tclsh.exe"
+
+for %%X in (%TCL_EXEC%) do (set TCL_FOUND=%%~$PATH:X)
+
+if defined TCL_FOUND (
+  %TCL_EXEC% %~dp0adm/start.tcl upgrade %*
+) else (
+  echo "Error. %TCL_EXEC% is not found. Please update PATH variable"
+)
+
+SET "PATH=%OLD_PATH%"