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

0028417: Using PRECOMPILED HEADER to speed up compilation time

Browse Source 
Use of Cotire tool is introduced for acceleration of CMake builds, by usage of precompiled headers.
CMake option BUILD_USE_PCH is added to enable / disable use of precompiled headers

When precompiled headers are used, additional compiler macros are defined globally in the build system to avoid problems due to different order of included files:
- NOMINMAX is defined on Windows to prevent defining "min" and "max" as macros by windows.h
- STRSAFE_NO_DEPRECATE and _SCL_SECURE_NO_WARNINGS are defined on Windows to prevent declaring functions of standard C library as deprecated by #pragma, and other warnings in system headers
- GL_GLEXT_LEGACY and GLX_GLEXT_LEGACY are defined to ensure that only OCCT's own glext.h is used
- __STDC_FORMAT_MACROS is defined to have standard C print format macros always defined

Code is corrected to avoid conflicts with system headers and in case of compiling together as unity builds (partially):
- Some locally defined variables in TKV3d, TKHLR are renamed to be unique
- Duplicated definitions of macros and global functions are eliminated in TKSTEP
- Useless header WNT_UInt.hxx is removed
- Usage of local variables conflicting with X11 macro is avoided in Draw_Viewer.cxx
- Local variables in AIS_ConcentricRelation.cxx are renamed to avoid conflict with macros defined in windows.h
- HXX files containing code are renamed to PXX or merged with corresponding CXX files.

IVtkTools classes are corrected to avoid compiler warnings disabled in non-PCH builds by inclusion of VTK headers.

Useless pragmas disabling warnings on MSVC are removed
This commit is contained in:
abv
2017-06-29 20:17:39 +03:00
committed by bugmaster
parent a07cff6957
commit 896faa7296
91 changed files with 5213 additions and 1746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/AIS/AIS_ConcentricRelation.cxx
View File

@@ -186,9 +186,9 @@ void AIS_ConcentricRelation::ComputeTwoEdgesConcentric(const Handle(Prs3d_Presen
// choose the radius equal to 1/5 of the smallest radius of
// 2 circles. Limit is imposed ( 0.02 by chance)
Standard_Real rad1 = gcirc1->Radius();
Standard_Real rad2 = gcirc2->Radius();
myRad = (rad1 > rad2 ) ? rad2 : rad1;
Standard_Real aRad1 = gcirc1->Radius();
Standard_Real aRad2 = gcirc2->Radius();
myRad = (aRad1 > aRad2 ) ? aRad2 : aRad1;
myRad /= 5;
if (myRad > 15.) myRad =15.;

4
src/AIS/AIS_InteractiveContext_1.cxx
View File

@@ -56,7 +56,7 @@ typedef NCollection_DataMap<Handle(AIS_InteractiveObject), NCollection_Handle<Se
namespace
{
TopoDS_Shape AIS_myDummyShape;
TopoDS_Shape AIS_InteractiveContext_myDummyShape;
}
//=======================================================================
@@ -1679,7 +1679,7 @@ const TopoDS_Shape& AIS_InteractiveContext::DetectedCurrentShape() const
if (aCurrentShape.IsNull())
{
return AIS_myDummyShape;
return AIS_InteractiveContext_myDummyShape;
}
return aCurrentShape->Shape();

8
src/AIS/AIS_LocalContext_1.cxx
View File

@@ -54,7 +54,7 @@
namespace
{
TopoDS_Shape AIS_myDummyShape;
TopoDS_Shape AIS_LocalContext_myDummyShape;
}
//==================================================
@@ -1209,10 +1209,10 @@ AIS_LocalContext::DetectedShape() const
if(mylastindex != 0)
{
Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(myMapOfOwner->FindKey (mylastindex));
if(BROwnr.IsNull()) return AIS_myDummyShape;
if(BROwnr.IsNull()) return AIS_LocalContext_myDummyShape;
return BROwnr->Shape();
}
return AIS_myDummyShape;
return AIS_LocalContext_myDummyShape;
}
//=======================================================================
@@ -1476,7 +1476,7 @@ const TopoDS_Shape& AIS_LocalContext::DetectedCurrentShape() const
if (aCurrentShape.IsNull())
{
return AIS_myDummyShape;
return AIS_LocalContext_myDummyShape;
}
return aCurrentShape->Shape();