mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +03:00
0028417: Using PRECOMPILED HEADER to speed up compilation time
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:
@@ -15,8 +15,8 @@
|
||||
#include <Message_ProgressScale.hxx>
|
||||
#include <TCollection_HAsciiString.hxx>
|
||||
|
||||
static const Standard_Real ZERO = 1e-10;
|
||||
static const Standard_Real INFINITE = 1e100;
|
||||
static const Standard_Real Message_ProgressScale_ZERO = 1e-10;
|
||||
static const Standard_Real Message_ProgressScale_INFINITE = 1e100;
|
||||
|
||||
//=======================================================================
|
||||
//function : Message_ProgressScale
|
||||
@@ -37,7 +37,7 @@ Message_ProgressScale::Message_ProgressScale () :
|
||||
Standard_Real Message_ProgressScale::LocalToBase (const Standard_Real val) const
|
||||
{
|
||||
if ( val <= myMin ) return myFirst;
|
||||
if ( myMax - myMin <= ZERO ) return myLast;
|
||||
if ( myMax - myMin <= Message_ProgressScale_ZERO ) return myLast;
|
||||
|
||||
if ( ! myInfinite ) {
|
||||
if ( val >= myMax ) return myLast;
|
||||
@@ -55,8 +55,8 @@ Standard_Real Message_ProgressScale::LocalToBase (const Standard_Real val) const
|
||||
|
||||
Standard_Real Message_ProgressScale::BaseToLocal (const Standard_Real val) const
|
||||
{
|
||||
if ( myLast - val <= ZERO )
|
||||
return myInfinite ? INFINITE : myMax;
|
||||
if ( myLast - val <= Message_ProgressScale_ZERO )
|
||||
return myInfinite ? Message_ProgressScale_INFINITE : myMax;
|
||||
if ( ! myInfinite )
|
||||
return myMin + ( myMax - myMin ) * ( val - myFirst ) / ( myLast - myFirst );
|
||||
// Standard_Real x = log ( ( val - myFirst ) / ( myLast - val ) ); // exponent
|
||||
|
Reference in New Issue
Block a user