OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

Correction in macro

Browse Source
This commit is contained in:
abv
2015-11-28 13:06:32 +03:00
parent 054fcde1d8
commit c92a1d9864
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
adm/upgrade.tcl
View File

@@ -484,7 +484,7 @@ proc ConvertTColFwd {thePackagePath theHeaderExtensions} {
proc DefineExplicitRtti {hxxfile class base theSourceExtensions} { proc DefineExplicitRtti {hxxfile class base theSourceExtensions} {
# if current file is not a header (by extension), exit with "inline" variant # if current file is not a header (by extension), exit with "inline" variant
# (there is no need to bother with out-of-line instantiations for local class) # (there is no need to bother with out-of-line instantiations for local class)
set ext [file extension $hxxfile] set ext [string range [file extension $hxxfile] 1 end]
if { [lsearch -exact [split $theSourceExtensions ,] $ext] >=0 } { if { [lsearch -exact [split $theSourceExtensions ,] $ext] >=0 } {
return "_INLINE" return "_INLINE"
} }
@@ -518,13 +518,19 @@ proc DefineExplicitRtti {hxxfile class base theSourceExtensions} {
# non-preprocessor line # non-preprocessor line
set aNewFileContent {} set aNewFileContent {}
set injected 0 set injected 0
set inc_found 0
foreach line $aFileContent { foreach line $aFileContent {
if { ! $injected && ! [regexp {^\s*//} $line] && if { ! $injected } {
! [regexp {^\s*$} $line] && ! [regexp {^\s*\#\s*include} $line] } { # add macro before first non-empty line after #includes
set injected 1 if { [regexp {^\s*$} $line] } {
lappend aNewFileContent "IMPLEMENT_STANDARD_RTTIEXT($class,$base)" } elseif { [regexp {^\s*\#\s*include} $line] } {
if { ! [regexp "^IMPLEMENT_" $line] } { set inc_found 1
lappend aNewFileContent "" } elseif { $inc_found } {
set injected 1
lappend aNewFileContent "IMPLEMENT_STANDARD_RTTIEXT($class,$base)"
if { ! [regexp "^IMPLEMENT_" $line] } {
lappend aNewFileContent ""
}
} }
} }
lappend aNewFileContent $line lappend aNewFileContent $line

1
src/PrsMgr/PrsMgr_PresentationManager3d.hxx
View File

@@ -20,6 +20,5 @@
#include <PrsMgr_PresentationManager.hxx> #include <PrsMgr_PresentationManager.hxx>
typedef PrsMgr_PresentationManager PrsMgr_PresentationManager3d; typedef PrsMgr_PresentationManager PrsMgr_PresentationManager3d;
typedef Handle_PrsMgr_PresentationManager Handle_PrsMgr_PresentationManager3d;
#endif // _PrsMgr_PresentationManager3d_HeaderFile #endif // _PrsMgr_PresentationManager3d_HeaderFile

3
src/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
View File

@@ -27,6 +27,7 @@ class StepRepr_HArray1OfShapeAspect;
class StepDimTol_RunoutZoneDefinition; class StepDimTol_RunoutZoneDefinition;
DEFINE_STANDARD_HANDLE(StepDimTol_RunoutZoneDefinition, StepDimTol_ToleranceZoneDefinition) DEFINE_STANDARD_HANDLE(StepDimTol_RunoutZoneDefinition, StepDimTol_ToleranceZoneDefinition)
//! Representation of STEP entity ToleranceZoneDefinition //! Representation of STEP entity ToleranceZoneDefinition
class StepDimTol_RunoutZoneDefinition : public StepDimTol_ToleranceZoneDefinition class StepDimTol_RunoutZoneDefinition : public StepDimTol_ToleranceZoneDefinition
{ {
@@ -53,7 +54,7 @@ public:
myOrientation = theOrientation; myOrientation = theOrientation;
} }
DEFINE_STANDARD_RTTI(StepDimTol_ToleranceZoneDefinition, StepDimTol_ToleranceZoneDefinition) DEFINE_STANDARD_RTTI(StepDimTol_RunoutZoneDefinition,StepDimTol_ToleranceZoneDefinition)
private: private:
Handle(StepDimTol_RunoutZoneOrientation) myOrientation; Handle(StepDimTol_RunoutZoneOrientation) myOrientation;