0033261: Data Exchange, Step Import - Empty shape after reading process

Added a transfer for ShapeRepresentationRelationship in Transfer of MappedItem method,
in order to support link of components according to ISO 10303-203-2003.

CMakeLists.txt

@@ -35,6 +35,14 @@ macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
   endif()
 endmacro()
 
+# set using memory manager option for TKernel
+set (USE_MMGR_TYPE "NATIVE" CACHE STRING "Select using memory manager tool.")
+set_property(CACHE USE_MMGR_TYPE PROPERTY STRINGS "NATIVE" "FLEXIBLE" "TBB" "JEMALLOC")
+
+# set profile for C++ compiler and linker
+set (BUILD_OPT_PROFILE "Default" CACHE STRING "Select profile for compiler and linker.")
+set_property(CACHE BUILD_OPT_PROFILE PROPERTY STRINGS "Default" "Production")
+
 # include variable description
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vardescr")
 
@@ -820,12 +828,6 @@ else()
   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
 endif()
 
-# ExpToCasExe
-if (EMSCRIPTEN)
-  list (REMOVE_ITEM BUILD_TOOLKITS TKExpress)
-  list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
-endif()
-
 # bison
 if (BUILD_YACCLEX)
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")
@@ -840,6 +842,14 @@ else()
   OCCT_CHECK_AND_UNSET ("3RDPARTY_FLEX_EXECUTABLE")
 endif()
 
+# Jemalloc
+if ("${USE_MMGR_TYPE}" STREQUAL "JEMALLOC")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/jemalloc")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_JEMALLOC")
+  OCCT_CHECK_AND_UNSET ("INSTALL_JEMALLOC")
+endif()
+
 # qt for inspector and samples
 if (BUILD_Inspector OR BUILD_SAMPLES_QT)
   # check qt 3rdparty path

adm/MODULES

@@ -3,5 +3,6 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep
 ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
 Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
 ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe
-Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
+DataExchange TKDE TKXSBase TKDESTEP TKDEIGES TKDESTL TKDEVRML TKDECascade TKDEOBJ TKDEGLTF TKDEPLY TKXCAF TKXmlXCAF TKBinXCAF TKRWMesh
+DETools TKExpress ExpToCasExe
+Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE TKXSDRAWDE TKXSDRAWGLTF TKXSDRAWIGES TKXSDRAWOBJ TKXSDRAWPLY TKXSDRAWSTEP TKXSDRAWSTL TKXSDRAWVRML

adm/UDLIST

@@ -32,6 +32,7 @@ n UnitsAPI
 n gp
 n math
 r OS
+n FlexLexer
 t TKMath
 t TKernel
 n Adaptor2d
@@ -376,18 +377,13 @@ r SHMessage
 r XSMessage
 r XSTEPResource
 t TKBinXCAF
-t TKIGES
-t TKSTEP
-t TKSTEP209
-t TKSTEPAttr
-t TKSTEPBase
-t TKSTL
-t TKVRML
+t TKDESTL
+t TKDEVRML
 t TKXCAF
-t TKXDE
-t TKXDECascade
-t TKXDEIGES
-t TKXDESTEP
+t TKDE
+t TKDECascade
+t TKDEIGES
+t TKDESTEP
 t TKXSBase
 t TKXmlXCAF
 n BOPTest
@@ -419,7 +415,12 @@ n XDEDRAW
 n XSDRAW
 n XSDRAWIGES
 n XSDRAWSTEP
-n XSDRAWSTLVRML
+n XSDRAWSTL
+n XSDRAWVRML
+n XSDRAWDE
+n XSDRAWGLTF
+n XSDRAWOBJ
+n XSDRAWPLY
 r DrawResources
 t TKDCAF
 t TKDraw
@@ -431,6 +432,14 @@ t TKD3DHostTest
 t TKViewerTest
 t TKXDEDRAW
 t TKXSDRAW
+t TKXSDRAWIGES
+t TKXSDRAWSTEP
+t TKXSDRAWSTL
+t TKXSDRAWVRML
+t TKXSDRAWDE
+t TKXSDRAWGLTF
+t TKXSDRAWOBJ
+t TKXSDRAWPLY
 x DRAWEXE
 n QADraw
 n QANCollection
@@ -456,6 +465,9 @@ t TKVCAF
 n XCAFView
 n XCAFNoteObjects
 t TKRWMesh
+t TKDEGLTF
+t TKDEOBJ
+t TKDEPLY
 n RWGltf
 n RWMesh
 n RWObj

adm/cmake/jemalloc.cmake

@@ -0,0 +1,143 @@
+# JeMalloc
+
+if (NOT DEFINED INSTALL_JEMALLOC)
+  set (INSTALL_JEMALLOC OFF CACHE BOOL "${INSTALL_INSTALL_JEMALLOC_DESCR}")
+endif()
+
+# include occt macros. compiler_bitness, os_with_bit, compiler
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+
+# specify JEMALLOC folder in connection with 3RDPARTY_DIR
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+  if (NOT 3RDPARTY_JEMALLOC_DIR OR NOT EXISTS "${3RDPARTY_JEMALLOC_DIR}")
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" jemalloc JEMALLOC_DIR_NAME)
+    if (JEMALLOC_DIR_NAME)
+      set (3RDPARTY_JEMALLOC_DIR "${3RDPARTY_DIR}/${JEMALLOC_DIR_NAME}" CACHE PATH "The directory containing JEMALLOC" FORCE)
+      set (3RDPARTY_JEMALLOC_DIR "${3RDPARTY_DIR}/${JEMALLOC_DIR_NAME}")
+      message(STATUS "Info: JEMALLOC detected in ${3RDPARTY_JEMALLOC_DIR}")
+    endif()
+  endif()
+  else()
+endif()
+
+# define required JEMALLOC variables
+if (NOT DEFINED 3RDPARTY_JEMALLOC_INCLUDE_DIR)
+  set (3RDPARTY_JEMALLOC_INCLUDE_DIR  "" CACHE PATH "the path of headers directory")
+endif()
+
+# check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
+if (3RDPARTY_JEMALLOC_DIR AND EXISTS "${3RDPARTY_JEMALLOC_DIR}")
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_JEMALLOC_DIR 3RDPARTY_JEMALLOC_INCLUDE_DIR PATH "the path to JEMALLOC")
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_JEMALLOC_DIR 3RDPARTY_JEMALLOC_LIBRARY_DIR FILEPATH "The directory containing JEMALLOC libraries")
+endif()
+
+# header
+if (NOT 3RDPARTY_JEMALLOC_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_JEMALLOC_INCLUDE_DIR}")
+  set (HEADER_NAMES jemalloc.h)
+  
+  # set 3RDPARTY_JEMALLOC_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_JEMALLOC_INCLUDE_DIR
+  set (3RDPARTY_JEMALLOC_INCLUDE_DIR "3RDPARTY_JEMALLOC_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to header directory" FORCE)
+  
+  if (3RDPARTY_JEMALLOC_DIR AND EXISTS "${3RDPARTY_JEMALLOC_DIR}")
+    find_path (3RDPARTY_JEMALLOC_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                                 PATHS ${3RDPARTY_JEMALLOC_DIR}
+                                                 PATH_SUFFIXES include/jemalloc
+                                                 CMAKE_FIND_ROOT_PATH_BOTH
+                                                 NO_DEFAULT_PATH)
+  endif()
+endif()
+
+if (3RDPARTY_JEMALLOC_INCLUDE_DIR AND EXISTS "${3RDPARTY_JEMALLOC_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_JEMALLOC_INCLUDE_DIR}")
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_JEMALLOC_INCLUDE_DIR)
+  set (3RDPARTY_JEMALLOC_INCLUDE_DIR "" CACHE FILEPATH "the path to jemalloc.h" FORCE)
+endif()
+
+# Installing destination path
+if (WIN32)
+  set (JEMALLOC_INSTALL_DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+else()
+  set (JEMALLOC_INSTALL_DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+endif()
+
+macro (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)
+if (NOT 3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB})
+  set (JEMALLOC_PATH_SUFFIXES "lib" "bin")
+  set (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} "3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}-NOTFOUND")
+  if (3RDPARTY_JEMALLOC_DIR AND EXISTS "${3RDPARTY_JEMALLOC_DIR}")
+    find_library (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} NAMES ${MMGR_LIB}
+                  PATHS "${3RDPARTY_JEMALLOC_LIBRARY_DIR}" "${3RDPARTY_JEMALLOC_DIR}"
+                  PATH_SUFFIXES ${JEMALLOC_PATH_SUFFIXES}
+                  CMAKE_FIND_ROOT_PATH_BOTH
+                  NO_DEFAULT_PATH)
+  else()
+    find_library (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} NAMES ${MMGR_LIB}
+                  PATH_SUFFIXES ${JEMALLOC_PATH_SUFFIXES}
+                  CMAKE_FIND_ROOT_PATH_BOTH)
+  endif()
+  if (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB})
+    get_filename_component (3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} "${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}}" PATH)
+    set (3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}")
+  else()
+    set (3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} "")
+  endif()
+endif()
+if (3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB})
+  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}")
+  set (3RDPARTY_JEMALLOC_LIBRARY_DIR "${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}}" CACHE PATH "The directory containing JEMALLOC libraries" FORCE)
+else()
+  message("Cannot find ${MMGR_LIB} library in jemalloc 3rdparty")
+  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB})
+  set (3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} "")
+endif()
+set (JEMALLOC_IS_STATIC_LIB FALSE)
+if (((${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}} MATCHES "\.lib$")) OR ((${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}} MATCHES "\.a$")))
+  get_filename_component(STATIC_LIB_NAME ${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}} NAME)
+  list(APPEND CSF_MMGR "${STATIC_LIB_NAME}")
+  set (JEMALLOC_IS_STATIC_LIB TRUE)
+endif()
+# install instructions
+if (INSTALL_JEMALLOC AND NOT JEMALLOC_IS_STATIC_LIB)
+  OCCT_MAKE_OS_WITH_BITNESS()
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+  get_filename_component(3RDPARTY_JEMALLOC_LIBRARY ${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}} REALPATH)
+  if (SINGLE_GENERATOR)
+    install (FILES "${3RDPARTY_JEMALLOC_LIBRARY}"
+             DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+  else()
+      install (FILES "${3RDPARTY_JEMALLOC_LIBRARY}"
+             CONFIGURATIONS Debug
+             DESTINATION "${JEMALLOC_INSTALL_DESTINATION}d")
+      install (FILES "${3RDPARTY_JEMALLOC_LIBRARY}"
+               CONFIGURATIONS Release
+               DESTINATION "${JEMALLOC_INSTALL_DESTINATION}")
+      install (FILES "${3RDPARTY_JEMALLOC_LIBRARY}"
+               CONFIGURATIONS RelWithDebInfo
+               DESTINATION "${JEMALLOC_INSTALL_DESTINATION}i")
+  endif()
+  set (USED_3RDPARTY_JEMALLOC_DIR "")
+elseif(NOT JEMALLOC_IS_STATIC_LIB)
+  # the library directory for using by the executable
+  set (USED_3RDPARTY_JEMALLOC_DIR ${3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB}})
+endif()
+unset(3RDPARTY_JEMALLOC_LIBRARY_DIR_${MMGR_LIB} CACHE)
+unset(3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB} CACHE)
+endmacro()
+
+# Reset CSF variable
+set (CSF_MMGR "")
+
+# find static jemalloc lib
+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+if (WIN32)
+  JEMALLOC_LIB_SEARCH ("jemalloc" "STATIC")
+elseif(NOT WIN32)
+  JEMALLOC_LIB_SEARCH ("jemalloc_pic" "STATIC")
+  SET(CMAKE_FIND_LIBRARY_SUFFIXES "" "so")
+  JEMALLOC_LIB_SEARCH ("jemalloc.so.2" "SHARED")
+endif()
+
+# find shared jemalloc lib
+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".so")
+JEMALLOC_LIB_SEARCH ("jemalloc" "SHARED")

adm/cmake/occt_defs_flags.cmake

@@ -44,9 +44,25 @@ elseif (MSVC)
 endif()
 
 if (MSVC)
-  # string pooling (GF), function-level linking (Gy)
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GF /Gy")
-  set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GF /Gy")
+  if ("${BUILD_OPT_PROFILE}" STREQUAL "Production")
+    # string pooling (GF), function-level linking (Gy)
+    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GF /Gy")
+    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GF /Gy")
+
+    # Favor fast code (Ot), Omit frame pointers (Oy)
+    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ot /Oy")
+    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /Ot /Oy")
+
+    # Whole Program Optimisation (GL), Enable intrinsic functions (Oi)
+    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Oi")
+    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GL /Oi")
+
+    # Link-Time Code Generation(LTCG) is requared for Whole Program Optimisation(GL)
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
+  endif()
   if (BUILD_FORCE_RelWithDebInfo)
     # generate debug info (Zi), inline expansion level (Ob1)
     set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /Ob1")
@@ -118,6 +134,22 @@ if (MSVC)
   endif()
 elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]"))
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+
+  if ("${BUILD_OPT_PROFILE}" STREQUAL "Production")
+    # /Ot (favor speed over size) is similar to -O2 or -O3 in GCC/Clang.
+    # /Oy (omit frame pointers) is similar to -fomit-frame-pointer in GCC/Clang.
+    # /GL (whole program optimization) is similar to -flto (Link Time Optimization) in GCC/Clang.
+    # /GF (eliminate duplicate strings) doesn't have a direct equivalent in GCC/Clang, but the compilers do string pooling automatically.
+    # /Gy (enable function-level linking) is similar to -ffunction-sections in GCC/Clang.
+    # /fp:precise (improve floating-point consistency) is similar to -ffloat-store in GCC, but there isn't a perfect equivalent in Clang.
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -flto -ffunction-sections -ffloat-store")
+
+    # Link-Time Code Generation(LTCG) is requared for Whole Program Optimisation(GL)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto")
+    set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -flto")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -flto")
+  endif()
   if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
   endif()

adm/cmake/occt_toolkit.cmake

@@ -70,6 +70,16 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
     OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
     list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
 
+    # remove old general version of FlexLexer
+    if (EXISTS ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h)
+      message (STATUS "Info: remove old FLEX header file: ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h")
+      file(REMOVE ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h)
+    endif()
+    # install copy of FlexLexer.h locally to allow further building without flex
+    if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
+      configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
+    endif()
+
     # bison files
     OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
     list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
@@ -107,21 +117,11 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
             endif()
           endforeach()
 
-          if (EXISTS ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
-            message (STATUS "Info: remove old FLEX header file: ${FLEX_BISON_TARGET_DIR}/FlexLexer.h")
-            file(REMOVE ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
-          endif()
-
           file (STRINGS "${CURRENT_FLEX_FILE}" FILE_FLEX_CONTENT)
           foreach (FILE_FLEX_CONTENT_LINE ${FILE_FLEX_CONTENT})
             string (REGEX MATCH "%option c\\+\\+" CXX_FLEX_LANGUAGE_FOUND ${FILE_FLEX_CONTENT_LINE})
             if (CXX_FLEX_LANGUAGE_FOUND)
               set (FLEX_OUTPUT_FILE_EXT "cxx")
-
-              # install copy of FlexLexer.h locally to allow further building without flex
-              if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
-                configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${FLEX_BISON_TARGET_DIR}/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
-              endif()
             endif()
           endforeach()
           set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
@@ -284,9 +284,15 @@ else()
     else()
       set (aReleasePdbConf)
     endif()
-    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
+    if (BUILD_SHARED_LIBS)
+      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
              CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
              DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
+    else()
+      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
+             CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
+             DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}")
+    endif()
   endif()
 
   if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")

adm/cmake/vardescr.cmake

@@ -116,6 +116,7 @@ endmacro()
 
 BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_DETools              "DETools")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")

adm/scripts/android_build.bat

@@ -33,6 +33,7 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
+set "BUILD_DETools=OFF"
 
 rem Optional 3rd-party libraries to enable
 set "USE_FREETYPE=ON"
@@ -166,6 +167,7 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
+ -D BUILD_MODULE_DETools:BOOL="OFF" ^
  -D BUILD_MODULE_Draw:BOOL="OFF" ^
  -D BUILD_DOC_Overview:BOOL="OFF" ^
  -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^

adm/scripts/android_custom.bat.template

@@ -27,6 +27,7 @@ rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
+rem set "BUILD_MODULE_DETools=OFF"
 
 rem Optional 3rd-party libraries to enable
 rem set "USE_RAPIDJSON=ON"

adm/scripts/cmake_custom.bat.template

@@ -33,6 +33,7 @@ rem set BUILD_PATCH=
 
 rem set BUILD_MODULE_ApplicationFramework=ON
 rem set BUILD_MODULE_DataExchange=ON
+rem set BUILD_MODULE_DETools=OFF
 rem set BUILD_MODULE_Draw=ON
 rem set BUILD_MODULE_ModelingAlgorithms=ON
 rem set BUILD_MODULE_ModelingData=ON

adm/scripts/cmake_custom.sh.template

@@ -26,6 +26,7 @@ FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"
 
 #BUILD_MODULE_ApplicationFramework=ON
 #BUILD_MODULE_DataExchange=ON
+#BUILD_MODULE_DETools=OFF
 #BUILD_MODULE_Draw=ON
 #BUILD_MODULE_ModelingAlgorithms=ON
 #BUILD_MODULE_ModelingData=ON

adm/scripts/cmake_gen.bat

@@ -28,6 +28,7 @@ set BUILD_FORCE_RelWithDebInfo=OFF
 
 set BUILD_MODULE_ApplicationFramework=ON
 set BUILD_MODULE_DataExchange=ON
+set BUILD_MODULE_DETools=OFF
 set BUILD_MODULE_Draw=ON
 set BUILD_MODULE_ModelingAlgorithms=ON
 set BUILD_MODULE_ModelingData=ON
@@ -62,6 +63,7 @@ cmake -G "%arch_compile%" ^
   -D BUILD_LIBRARY_TYPE:STRING=%BUILD_LIBRARY_TYPE% ^
   -D BUILD_MODULE_ApplicationFramework:BOOL=%BUILD_MODULE_ApplicationFramework% ^
   -D BUILD_MODULE_DataExchange:BOOL=%BUILD_MODULE_DataExchange% ^
+  -D BUILD_MODULE_DETools:BOOL=%BUILD_MODULE_DETools% ^
   -D BUILD_MODULE_Draw:BOOL=%BUILD_MODULE_Draw% ^
   -D BUILD_MODULE_FoundationClasses:BOOL=ON ^
   -D BUILD_MODULE_ModelingAlgorithms:BOOL=%BUILD_MODULE_ModelingAlgorithms% ^

adm/scripts/cmake_gen.sh

@@ -31,6 +31,7 @@ BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
 
 BUILD_MODULE_ApplicationFramework=ON
 BUILD_MODULE_DataExchange=ON
+BUILD_MODULE_DETools=OFF
 BUILD_MODULE_Draw=ON
 BUILD_MODULE_ModelingAlgorithms=ON
 BUILD_MODULE_ModelingData=ON
@@ -63,6 +64,7 @@ cmake -G "Unix Makefiles" \
   -D BUILD_LIBRARY_TYPE:STRING=$BUILD_LIBRARY_TYPE \
   -D BUILD_MODULE_ApplicationFramework:BOOL=$BUILD_MODULE_ApplicationFramework \
   -D BUILD_MODULE_DataExchange:BOOL=$BUILD_MODULE_DataExchange \
+  -D BUILD_MODULE_DETools:BOOL=$BUILD_MODULE_DETools \
   -D BUILD_MODULE_Draw:BOOL=$BUILD_MODULE_Draw \
   -D BUILD_MODULE_FoundationClasses:BOOL=ON \
   -D BUILD_MODULE_ModelingAlgorithms:BOOL=$BUILD_MODULE_ModelingAlgorithms \

adm/scripts/ios_build.sh

@@ -34,6 +34,7 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
+export BUILD_DETools=OFF
 
 export USE_FREETYPE=ON
 export USE_FREEIMAGE=OFF
@@ -148,6 +149,7 @@ function buildArch {
   -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
   -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
   -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
+  -D BUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
   -D BUILD_MODULE_Draw:BOOL="OFF" \
   -D BUILD_DOC_Overview:BOOL="OFF" \
     "$aCasSrc" 2>&1 | tee -a "$aLogFile"

adm/scripts/ios_custom.sh.template

@@ -20,6 +20,7 @@ export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-ios"
 #export BUILD_Visualization=ON
 #export BUILD_ApplicationFramework=ON
 #export BUILD_DataExchange=ON
+#export BUILD_DETools=OFF
 
 #export USE_RAPIDJSON=ON
 #export USE_DRACO=ON

adm/scripts/macos_build.sh

@@ -34,6 +34,7 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
+export BUILD_DETools=OFF
 export BUILD_Draw=ON
 
 export USE_FREETYPE=ON
@@ -145,6 +146,7 @@ function buildArch {
   -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
   -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
   -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
+  -D BUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
   -D BUILD_MODULE_Draw:BOOL="${BUILD_Draw}" \
   -D BUILD_DOC_Overview:BOOL="OFF" \
     "$aCasSrc" 2>&1 | tee -a "$aLogFile"

adm/scripts/macos_custom.sh.template

@@ -19,6 +19,7 @@ export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-macos"
 #export BUILD_Visualization=ON
 #export BUILD_ApplicationFramework=ON
 #export BUILD_DataExchange=ON
+#export BUILD_DETools=OFF
 #export BUILD_Draw=ON
 
 #export USE_RAPIDJSON=ON

adm/scripts/mingw_build.bat

@@ -32,6 +32,7 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
+set "BUILD_DETools=OFF"
 set "BUILD_Draw=ON"
 
 rem Optional 3rd-party libraries to enable
@@ -155,6 +156,7 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
+ -D BUILD_MODULE_DETools:BOOL="%BUILD_DETools%" ^
  -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^
  -D 3RDPARTY_TCL_DIR:PATH="%aTclTk%" ^
  -D 3RDPARTY_TCL_INCLUDE_DIR:FILEPATH="%aTclTk%/include" ^

adm/scripts/mingw_custom.bat.template

@@ -22,6 +22,7 @@ rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
+rem set "BUILD_DETools=OFF"
 rem set "BUILD_Draw=ON"
 
 rem set "USE_RAPIDJSON=ON"

adm/scripts/wasm_build.bat

@@ -32,6 +32,7 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
+set "BUILD_DETools=OFF"
 set "BUILD_Draw=OFF"
 
 rem Optional 3rd-party libraries to enable
@@ -175,6 +176,7 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
+ -D BUILD_MODULE_DETools:BOOL="%BUILD_DETools%" ^
  -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^
  -D BUILD_DOC_Overview:BOOL="OFF" ^
  -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^

adm/scripts/wasm_build.sh

@@ -20,6 +20,7 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
+export BUILD_DETools=OFF
 
 if [ -f "${aScriptDir}/wasm_custom.sh" ] ; then
   . "${aScriptDir}/wasm_custom.sh"
@@ -74,6 +75,7 @@ echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
+-DBUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
 -DBUILD_MODULE_Draw:BOOL="OFF" \
 -DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"
 
@@ -92,6 +94,7 @@ cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
+-DBUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
 -DBUILD_MODULE_Draw:BOOL="OFF" \
 -DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"
 

adm/scripts/wasm_custom.bat.template

@@ -23,6 +23,7 @@ rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
+rem set "BUILD_DETools=OFF"
 
 rem set "USE_RAPIDJSON=ON"
 rem set "USE_DRACO=ON"

adm/scripts/wasm_custom.sh.template

@@ -14,3 +14,4 @@ export EMSDK_ROOT="$aSrcRoot/../emsdk"
 #export BUILD_Visualization=ON
 #export BUILD_ApplicationFramework=ON
 #export BUILD_DataExchange=ON
+#export BUILD_DETools=OFF

adm/templates/custom.build.bat.in

@@ -14,6 +14,7 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
     set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
     set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
+    set "JEMALLOC_DIR=@3RDPARTY_JEMALLOC_LIBRARY_DIR@"
     set "OPENVR_DIR=@3RDPARTY_OPENVR_DLL_DIRS@"
 
     if not "@3RDPARTY_QT_DIR@" == "" (

adm/templates/custom.build.sh.in

@@ -12,6 +12,7 @@ if [ "$1" == "@BIN_LETTER@" ]; then
     export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
     export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
     export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
+    export JEMALLOC_DIR="@3RDPARTY_JEMALLOC_LIBRARY_DIR@"
 
     if [ "x@3RDPARTY_QT_DIR" != "x" ]; then
       export QTDIR="@3RDPARTY_QT_DIR@"

adm/templates/custom.install.bat.in

@@ -16,6 +16,7 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
     set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
     set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
+    set "JEMALLOC_DIR=@USED_3RDPARTY_JEMALLOC_DIR@"
     set "OPENVR_DIR=@USED_3RDPARTY_OPENVR_DIR@"
 
     if not "@USED_3RDPARTY_QT_DIR@" == "" (

adm/templates/custom.install.sh.in

@@ -12,6 +12,7 @@ if [ "$1" == "@BIN_LETTER@" ]; then
     export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
     export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
     export FFMPEG_DIR="@USED_3RDPARTY_FFMPEG_DIR@"
+    export JEMALLOC_DIR="@USED_3RDPARTY_JEMALLOC_DIR@"
 
     if [ "x@USED_3RDPARTY_QT_DIR@" != "x" ]; then
       export QTDIR="@USED_3RDPARTY_QT_DIR@"

adm/templates/env.bat.in

@@ -154,6 +154,7 @@ if not ["%GLES2_DIR%"] == [""]         set "PATH=%GLES2_DIR%;%PATH%"
 if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
 if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
 if not ["%FFMPEG_DIR%"] == [""]        set "PATH=%FFMPEG_DIR%;%PATH%"
+if not ["%JEMALLOC_DIR%"] == [""]      set "PATH=%JEMALLOC_DIR%;%PATH%"
 if not ["%OPENVR_DIR%"] == [""]        set "PATH=%OPENVR_DIR%;%PATH%"
 
 rem ----- Set path to 3rd party and OCCT libraries -----

adm/templates/env.build.sh.in

@@ -69,6 +69,10 @@ if [ "$FFMPEG_DIR" != "" ]; then
   THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
 fi
 
+if [ "$JEMALLOC_DIR" != "" ]; then
+  THRDPARTY_PATH="${JEMALLOC_DIR}:${THRDPARTY_PATH}"
+fi
+
 if [ "$QTDIR" != "" ]; then
   THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
 fi

adm/templates/env.install.sh.in

@@ -71,6 +71,10 @@ if [ "$FFMPEG_DIR" != "" ]; then
   THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
 fi
 
+if [ "$JEMALLOC_DIR" != "" ]; then
+  THRDPARTY_PATH="${JEMALLOC_DIR}:${THRDPARTY_PATH}"
+fi
+
 if [ "$QTDIR" != "" ]; then
   THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
 fi

dox/contribution/coding_rules.md

@@ -725,7 +725,7 @@ Another possible problem is the order of initialization of global variables defi
 
 Avoid explicit usage of basic types (*int*, *float*, *double*, etc.), use Open CASCADE Technology types from package *Standard: Standard_Integer, Standard_Real, Standard_ShortReal, Standard_Boolean, Standard_CString* and others or a specific *typedef* instead.
 
-### Use *sizeof()* to calculate sizes [MANDATORY]
+### Use sizeof() to calculate sizes [MANDATORY]
 
 Do not assume sizes of types. Use *sizeof()* instead to calculate sizes.
 
@@ -738,7 +738,7 @@ It is recommended to follow this rule for any plain text files for consistency a
 
 The rules listed in this chapter are important for stability of the programs that use Open CASCADE Technology libraries.
 
-### Use *OSD::SetSignal()* to catch exceptions
+### Use OSD::SetSignal() to catch exceptions
 
 When using Open CASCADE Technology in an application, call *OSD::SetSignal()* function when the application is initialized.
 
@@ -787,7 +787,7 @@ See the following example:
 
 In C++ use *new* and *delete* operators instead of *malloc()* and *free()*. Try not to mix different memory allocation techniques.
 
-### Match *new* and *delete* [MANDATORY]
+### Match new and delete [MANDATORY]
 
 Use the same form of new and delete.
 
@@ -812,7 +812,7 @@ Standard_Integer aTmpVar2 = 0; // OK
 
 Uninitialized variables might be kept only within performance-sensitive code blocks and only when their initialization is guaranteed by subsequent code.
 
-### Do not hide global *new*
+### Do not hide global new
 
 Avoid hiding the global *new* operator.
 

dox/contribution/tests/tests.md

@@ -1089,10 +1089,10 @@ This group allows  testing extended data exchange packages.
 | Draw  | TKDraw, TKTopTest, TKViewerTest, TKXSDRAW, TKDCAF, TKXDEDRAW, TKTObjDRAW, TKQADraw, DRAWEXE, Problems of testing system | draw | 
 | Shape Healing | TKShHealing | heal |
 | Mesh  | TKMesh, TKXMesh | mesh |
-| Data Exchange | TKIGES  | iges |
-| Data Exchange | TKSTEPBase, TKSTEPAttr, TKSTEP209, TKSTEP | step |
-| Data Exchange | TKSTL, TKVRML   | stlvrml |
-| Data Exchange | TKXSBase, TKXCAF, TKXCAFSchema, TKXDEIGES, TKXDESTEP, TKXmlXCAF, TKBinXCAF | xde |
+| Data Exchange | TKDEIGES  | iges |
+| Data Exchange | TKDESTEP | step |
+| Data Exchange | TKDESTL, TKDEVRML   | stlvrml |
+| Data Exchange | TKXSBase, TKXCAF, TKXCAFSchema, TKXmlXCAF, TKBinXCAF | xde |
 | Foundation Classes |  TKernel, TKMath | fclasses |
 | Modeling_algorithms | TKGeomAlgo, TKTopAlgo, TKPrim, TKBO, TKBool, TKHLR, TKFillet, TKOffset, TKFeat, TKXMesh | modalg |
 | Modeling Data | TKG2d, TKG3d, TKGeomBase, TKBRep  | moddata |

dox/upgrade/upgrade.md

@@ -7,7 +7,7 @@ Upgrade from older OCCT versions  {#occt__upgrade}
 
 This document provides technical details on changes made in particular versions of OCCT. It can help to upgrade user applications based on previous versions of OCCT to newer ones.
 
-@ref upgrade_occt770 "SEEK TO THE LAST CHAPTER (UPGRADE TO 7.7.0)"
+@ref upgrade_occt780 "SEEK TO THE LAST CHAPTER (UPGRADE TO 7.8.0)"
 
 @subsection upgrade_intro_precautions Precautions
 
@@ -2343,3 +2343,69 @@ Please use `BRepLib_ToolTriangulatedShape::ComputeNormals()` to fill in normal a
 
 A new way of using the `BRepExtrema_ShapeProximity` class was provided for computing a proximity value between two shapes.
 If at initialization of the `BRepExtrema_ShapeProximity` class the *theTolerance* parameter is not defined (Precision::Infinite() by default), the proximity value will be computed.
+
+@section upgrade_occt780 Upgrade to OCCT 7.8.0
+
+@subsection upgrade_780_recommendations New Features and Recommendations
+
+The NCollection containers have been modernized to work with move semantics through the new `Move operator` and `Move constructor`. It is recommended to leverage this functionality in the development process.<br />
+Backward compatibility with STL allocators has been implemented to use the OCCT memory manager with STL allocators (NCollection_Allocator, NCollection_OccAllocator).<br />
+Additionally, utilities have been introduced to work with `shared_ptr` and `unique_ptr` using the OCCT memory manager (`Standard_MemoryUtils.hxx`).
+
+@subsection upgrade_780_ncollection_update Change in Default Clear Behavior for Containers
+
+NCollection container's `Clear(const bool theReleaseMemory = true)` have been changed to `Clear(const bool theReleaseMemory = false)`.<br />
+Impacted classes include `IndexedMap`, `IndexedDataMap`, `Map`, `DataMap`, `DynamicArray(Vector)`, `IncAllocator`.<br />
+This means that allocated memory for the container will be reused. In this case, it's necessary to be careful with `IncAllocator::Reset()` to control owners of memory blocks.
+
+@subsection upgrade_780_hash_utils Reworked Hash Mechanism for Hash Map (NCollection's map)
+
+The `HashCode(value, upperBound)` static method has been removed and `IsEqual(value1, value2)` is no longer used in the map.<br />
+NCollection's map now operates on an STL-like hash mechanism: a struct with a public operator `size_t operator()(object&) const` and `bool operator(object&, object&) const`.<br />
+The difference between STL and OCCT is that the hash struct and comparator are combined into a single struct to reduce conflicts on OCCT's user side.<br />
+Hash utils have been implemented to hash objects, returning `uint32_t` and `uint64_t` depending on the template (`Standard_HashUtils.hxx`). Algorithms used are `MurmurHash` and `FNVHash`.<br />
+Benefits:
+* x64 using 8 bytes to store the hash instead of 4 bytes.
+* OCCT classes will now be usable as elements in STL `unordered_map` and `unordered_set`.
+
+The migration problem will occur at compile time. Make sure that `int HashCode` has been changed anywhere to `size operator` and `bool IsEqual` to `bool operator`.
+
+@subsection upgrade_780_removed_files Removed Hash Specialization Classes
+
+The majority of include files containing only specialized hashes have been removed.
+Their functionality has been consolidated into the hashed object include file (in the "std" namespace).<br />
+It is guaranteed that each removed hash class has been transferred to the native hash mechanism of the hashed class.
+
+The migration problem may arise at compile time. Ensure that you remove any files that have been deprecated.
+
+@subsection upgrade_780_tk_rework Reorganized DE TK
+
+DE TK components have been combined or separated based on specific CAD formats to support plug-in ability.
+* Components now have a "TKDE" prefix. The available list includes `TKDESTEP`, `TKDEOBJ`, `TKDEIGES`, `TKDEGLTF`, `TKDEVRML`, `TKDEPLY`, `TKDESTL`.
+* The DE DRAW TK has been updated in a similar way: DRAW components now have a "TKXSDRAW" prefix. The available list includes `TKXSDRAWSTEP`, `TKXSDRAWOBJ`, `TKXSDRAWIGES`, `TKXSDRAWGLTF`, `TKXSDRAWVRML`, `TKXSDRAWPLY`, `TKXSDRAWSTL`.
+
+Migration problems may occur during configuration time or compile time. Ensure that you update your project configuration accordingly.
+
+@subsection upgrade_780_step_thread_safety Implemented STEP Thread-safety Interface
+
+The STEP interface now uses Static_Interface to extract exchange settings.<br />
+A new ability has been implemented to determine parameters in STEP, avoiding Static_Interface.
+* For reading, use an additional argument with STEP's parameters in `ReadFile` or `Perform`.
+* For writing, use an additional argument with STEP's parameters in `Transfer` or `Perform`.
+
+@subsection upgrade_780_new_memory_manager New Memory Management Functionality
+
+`Standard.hxx` has a new method `AllocateOptimal` for allocating without post-processing (cleaning).<br />
+New profiles to allocate memory (defined at configuration time):
+* `Native` - allocates with standard `malloc` and `calloc` functionality, performance depends on the OS.
+* `TBB` - allocates with TBB's `scalable` allocator functionality.
+* `JeMalloc` - allocates with `jemalloc` functions.
+* `Flexible` - old-way allocation which defines allocation method in real-time by environment variables.<br />
+
+The most recommended manager is `JeMalloc`. To use it with a plugin system, like `DRAW`, please ensure that JeMalloc was built with the `--disable-initial-exec-tls` flag. For more details, visit [JeMalloc](http://jemalloc.net/).
+
+@subsection upgrade_780_optimization_profiles New CMake Variable for Optimization Profiles
+
+`BUILD_OPT_PROFILE` is a new variable to define optimization level. Available profiles:
+* `Default` - specializes only in quality-dependent parameters for the compiler.
+* `Production` - specializes in performance and quality-dependent parameters for the compiler and linker.

dox/user_guides/draw_test_harness/draw_test_harness.md

@@ -780,7 +780,7 @@ restore theBox
 
 @subsubsection occt_draw_3_3_1 set
 
-#### In *DrawTrSurf* package:
+#### In DrawTrSurf package:
 
 ~~~~{.php}
 void Set(Standard_CString& Name,const gp_Pnt& G) ; 
@@ -797,7 +797,7 @@ void Set(Standard_CString& Name,
 const Handle(Poly_Polygon2D)& P) ; 
 ~~~~
 
-#### In *DBRep* package:
+#### In DBRep package:
 
 ~~~~{.php}
 void Set(const Standard_CString Name, 
@@ -822,13 +822,13 @@ DBRep::Set(char*,B);
 
 @subsubsection occt_draw_3_3_2 get
 
-#### In *DrawTrSurf* package:
+#### In DrawTrSurf package:
  
 ~~~~{.php}
 Handle_Geom_Geometry Get(Standard_CString& Name) ; 
 ~~~~
 
-#### In *DBRep* package:
+#### In DBRep package:
 
 ~~~~{.php}
 TopoDS_Shape Get(Standard_CString& Name, 

dox/user_guides/step/step.md

@@ -1498,7 +1498,7 @@ It is necessary to call command *newmodel* to perform a new translation of the n
 
 @section occt_step_7 Reading from and writing to STEP
 
-The *STEPCAFControl* package (TKXDESTEP toolkit) provides tools to read and write STEP files (see XDE User's Guide). 
+The *STEPCAFControl* package (TKDESTEP toolkit) provides tools to read and write STEP files (see XDE User's Guide). 
 
 In addition to the translation of shapes implemented in basic translator, it provides the following: 
   * STEP assemblies, read as OCCT compounds by basic translator, are translated to XDE assemblies;

samples/CSharp/OCCTProxy/OCCTProxy.cpp

@@ -43,10 +43,10 @@
 #pragma comment(lib, "TKService.lib")
 #pragma comment(lib, "TKV3d.lib")
 #pragma comment(lib, "TKOpenGl.lib")
-#pragma comment(lib, "TKIGES.lib")
-#pragma comment(lib, "TKSTEP.lib")
-#pragma comment(lib, "TKStl.lib")
-#pragma comment(lib, "TKVrml.lib")
+#pragma comment(lib, "TKDEIGES.lib")
+#pragma comment(lib, "TKDESTEP.lib")
+#pragma comment(lib, "TKDESTL.lib")
+#pragma comment(lib, "TKDEVRML.lib")
 #pragma comment(lib, "TKLCAF.lib")
 
 //! Auxiliary tool for converting C# string into UTF-8 string.

samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp

@@ -51,10 +51,10 @@
 #pragma comment(lib, "TKV3d.lib")
 #pragma comment(lib, "TKOpenGl.lib")
 #pragma comment(lib, "TKD3dHost.lib")
-#pragma comment(lib, "TKIGES.lib")
-#pragma comment(lib, "TKSTEP.lib")
-#pragma comment(lib, "TKStl.lib")
-#pragma comment(lib, "TKVrml.lib")
+#pragma comment(lib, "TKDEIGES.lib")
+#pragma comment(lib, "TKDESTEP.lib")
+#pragma comment(lib, "TKDESTL.lib")
+#pragma comment(lib, "TKDEVRML.lib")
 #pragma comment(lib, "TKLCAF.lib")
 
 #pragma comment(lib, "D3D9.lib")

samples/glfw/adm/cmake/FindOpenCASCADE.cmake

@@ -63,7 +63,7 @@ set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKG2d TKG3d TKGeomBase TKBRep) # M
 set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing) # ModelingAlgorithms
 set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost) # Visualization
 set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF) # ApplicationFramework
-set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh) # DataExchange
+set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKXSBase TKXCAF TKDEIGES TKDESTEP TKDESTL TKDEVRML TKXmlXCAF TKBinXCAF TKRWMesh TKDEGLTF TKDEOBJ TKDEPLY) # DataExchange
 set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKDraw TKViewerTest) # Draw
 
 # validate location of OCCT libraries and headers

samples/ios/UIKitSample/UIKitSample.xcodeproj/project.pbxproj

@@ -26,14 +26,10 @@
 		0A7DEDFC1E2D29FF00267B9B /* libTKV3d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEDF71E2D29F800267B9B /* libTKV3d.a */; };
 		0A7DEDFD1E2D29FF00267B9B /* libTKVCAF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEDF81E2D29FB00267B9B /* libTKVCAF.a */; };
 		0A7DEE2B1E2D2AE000267B9B /* libTKService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE0B1E2D2A9D00267B9B /* libTKService.a */; };
-		0A7DEE2E1E2D2AE000267B9B /* libTKSTEP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE0E1E2D2AA800267B9B /* libTKSTEP.a */; };
-		0A7DEE301E2D2AE000267B9B /* libTKSTEPAttr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE101E2D2AAE00267B9B /* libTKSTEPAttr.a */; };
-		0A7DEE311E2D2AE000267B9B /* libTKSTEPBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE111E2D2AB200267B9B /* libTKSTEPBase.a */; };
+		0A7DEE2E1E2D2AE000267B9B /* libTKDESTEP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE0E1E2D2AA800267B9B /* libTKDESTEP.a */; };
 		0A7DEE351E2D2AE000267B9B /* libTKXCAF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE151E2D2AC000267B9B /* libTKXCAF.a */; };
-		0A7DEE371E2D2AE000267B9B /* libTKXDESTEP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE171E2D2AC700267B9B /* libTKXDESTEP.a */; };
 		0A7DEE3E1E2D2B8100267B9B /* libTKBO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE021E2D2A7F00267B9B /* libTKBO.a */; };
 		0A7DEE3F1E2D2BB000267B9B /* libTKOpenGles.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE091E2D2A9700267B9B /* libTKOpenGles.a */; };
-		0A7DEE401E2D2BEA00267B9B /* libTKSTEP209.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE0F1E2D2AAB00267B9B /* libTKSTEP209.a */; };
 		0A7DEE411E2D2C1500267B9B /* libTKXSBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A7DEE1D1E2D2ADC00267B9B /* libTKXSBase.a */; };
 		0AAE0DE61EAF816E00C1F65B /* screw.step in Resources */ = {isa = PBXBuildFile; fileRef = 0AAE0DE51EAF816D00C1F65B /* screw.step */; };
 		0AE286641EB0D29B00A9D719 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AE286631EB0D29A00A9D719 /* libz.tbd */; };
@@ -79,7 +75,7 @@
 		0A7DEE031E2D2A8200267B9B /* libTKBool.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKBool.a; path = ../occt/lib/libTKBool.a; sourceTree = "<group>"; };
 		0A7DEE041E2D2A8500267B9B /* libTKFeat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKFeat.a; path = ../occt/lib/libTKFeat.a; sourceTree = "<group>"; };
 		0A7DEE051E2D2A8900267B9B /* libTKFillet.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKFillet.a; path = ../occt/lib/libTKFillet.a; sourceTree = "<group>"; };
-		0A7DEE061E2D2A8C00267B9B /* libTKIGES.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKIGES.a; path = ../occt/lib/libTKIGES.a; sourceTree = "<group>"; };
+		0A7DEE061E2D2A8C00267B9B /* libTKDEIGES.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKDEIGES.a; path = ../occt/lib/libTKDEIGES.a; sourceTree = "<group>"; };
 		0A7DEE071E2D2A8F00267B9B /* libTKMeshVS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKMeshVS.a; path = ../occt/lib/libTKMeshVS.a; sourceTree = "<group>"; };
 		0A7DEE081E2D2A9300267B9B /* libTKOffset.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKOffset.a; path = ../occt/lib/libTKOffset.a; sourceTree = "<group>"; };
 		0A7DEE091E2D2A9700267B9B /* libTKOpenGles.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKOpenGles.a; path = ../occt/lib/libTKOpenGles.a; sourceTree = "<group>"; };
@@ -87,16 +83,11 @@
 		0A7DEE0B1E2D2A9D00267B9B /* libTKService.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKService.a; path = ../occt/lib/libTKService.a; sourceTree = "<group>"; };
 		0A7DEE0C1E2D2AA100267B9B /* libTKStd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKStd.a; path = ../occt/lib/libTKStd.a; sourceTree = "<group>"; };
 		0A7DEE0D1E2D2AA400267B9B /* libTKStdL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKStdL.a; path = ../occt/lib/libTKStdL.a; sourceTree = "<group>"; };
-		0A7DEE0E1E2D2AA800267B9B /* libTKSTEP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTEP.a; path = ../occt/lib/libTKSTEP.a; sourceTree = "<group>"; };
-		0A7DEE0F1E2D2AAB00267B9B /* libTKSTEP209.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTEP209.a; path = ../occt/lib/libTKSTEP209.a; sourceTree = "<group>"; };
-		0A7DEE101E2D2AAE00267B9B /* libTKSTEPAttr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTEPAttr.a; path = ../occt/lib/libTKSTEPAttr.a; sourceTree = "<group>"; };
-		0A7DEE111E2D2AB200267B9B /* libTKSTEPBase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTEPBase.a; path = ../occt/lib/libTKSTEPBase.a; sourceTree = "<group>"; };
-		0A7DEE121E2D2AB500267B9B /* libTKSTL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKSTL.a; path = ../occt/lib/libTKSTL.a; sourceTree = "<group>"; };
+		0A7DEE0E1E2D2AA800267B9B /* libTKDESTEP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKDESTEP.a; path = ../occt/lib/libTKDESTEP.a; sourceTree = "<group>"; };
+		0A7DEE121E2D2AB500267B9B /* libTKDESTL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKDESTL.a; path = ../occt/lib/libTKDESTL.a; sourceTree = "<group>"; };
 		0A7DEE131E2D2AB900267B9B /* libTKTObj.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKTObj.a; path = ../occt/lib/libTKTObj.a; sourceTree = "<group>"; };
-		0A7DEE141E2D2ABC00267B9B /* libTKVRML.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKVRML.a; path = ../occt/lib/libTKVRML.a; sourceTree = "<group>"; };
+		0A7DEE141E2D2ABC00267B9B /* libTKDEVRML.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKDEVRML.a; path = ../occt/lib/libTKDEVRML.a; sourceTree = "<group>"; };
 		0A7DEE151E2D2AC000267B9B /* libTKXCAF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXCAF.a; path = ../occt/lib/libTKXCAF.a; sourceTree = "<group>"; };
-		0A7DEE161E2D2AC300267B9B /* libTKXDEIGES.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXDEIGES.a; path = ../occt/lib/libTKXDEIGES.a; sourceTree = "<group>"; };
-		0A7DEE171E2D2AC700267B9B /* libTKXDESTEP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXDESTEP.a; path = ../occt/lib/libTKXDESTEP.a; sourceTree = "<group>"; };
 		0A7DEE181E2D2ACA00267B9B /* libTKXMesh.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXMesh.a; path = ../occt/lib/libTKXMesh.a; sourceTree = "<group>"; };
 		0A7DEE191E2D2ACE00267B9B /* libTKXml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXml.a; path = ../occt/lib/libTKXml.a; sourceTree = "<group>"; };
 		0A7DEE1A1E2D2AD100267B9B /* libTKXmlL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTKXmlL.a; path = ../occt/lib/libTKXmlL.a; sourceTree = "<group>"; };
@@ -134,13 +125,10 @@
 			files = (
 				0AE286641EB0D29B00A9D719 /* libz.tbd in Frameworks */,
 				0A7DEE411E2D2C1500267B9B /* libTKXSBase.a in Frameworks */,
-				0A7DEE401E2D2BEA00267B9B /* libTKSTEP209.a in Frameworks */,
 				0A7DEE3F1E2D2BB000267B9B /* libTKOpenGles.a in Frameworks */,
 				0A7DEE3E1E2D2B8100267B9B /* libTKBO.a in Frameworks */,
 				0A7DEE2B1E2D2AE000267B9B /* libTKService.a in Frameworks */,
-				0A7DEE2E1E2D2AE000267B9B /* libTKSTEP.a in Frameworks */,
-				0A7DEE301E2D2AE000267B9B /* libTKSTEPAttr.a in Frameworks */,
-				0A7DEE311E2D2AE000267B9B /* libTKSTEPBase.a in Frameworks */,
+				0A7DEE2E1E2D2AE000267B9B /* libTKDESTEP.a in Frameworks */,
 				0A7DEE351E2D2AE000267B9B /* libTKXCAF.a in Frameworks */,
 				0A7DEE371E2D2AE000267B9B /* libTKXDESTEP.a in Frameworks */,
 				0A7DEDE71E2D28E300267B9B /* libTKBRep.a in Frameworks */,
@@ -231,7 +219,7 @@
 				0A7DEE031E2D2A8200267B9B /* libTKBool.a */,
 				0A7DEE041E2D2A8500267B9B /* libTKFeat.a */,
 				0A7DEE051E2D2A8900267B9B /* libTKFillet.a */,
-				0A7DEE061E2D2A8C00267B9B /* libTKIGES.a */,
+				0A7DEE061E2D2A8C00267B9B /* libTKDEIGES.a */,
 				0A7DEE071E2D2A8F00267B9B /* libTKMeshVS.a */,
 				0A7DEE081E2D2A9300267B9B /* libTKOffset.a */,
 				0A7DEE091E2D2A9700267B9B /* libTKOpenGles.a */,
@@ -239,16 +227,11 @@
 				0A7DEE0B1E2D2A9D00267B9B /* libTKService.a */,
 				0A7DEE0C1E2D2AA100267B9B /* libTKStd.a */,
 				0A7DEE0D1E2D2AA400267B9B /* libTKStdL.a */,
-				0A7DEE0E1E2D2AA800267B9B /* libTKSTEP.a */,
-				0A7DEE0F1E2D2AAB00267B9B /* libTKSTEP209.a */,
-				0A7DEE101E2D2AAE00267B9B /* libTKSTEPAttr.a */,
-				0A7DEE111E2D2AB200267B9B /* libTKSTEPBase.a */,
-				0A7DEE121E2D2AB500267B9B /* libTKSTL.a */,
+				0A7DEE0E1E2D2AA800267B9B /* libTKDESTEP.a */,
+				0A7DEE121E2D2AB500267B9B /* libTKDESTL.a */,
 				0A7DEE131E2D2AB900267B9B /* libTKTObj.a */,
-				0A7DEE141E2D2ABC00267B9B /* libTKVRML.a */,
+				0A7DEE141E2D2ABC00267B9B /* libTKDEVRML.a */,
 				0A7DEE151E2D2AC000267B9B /* libTKXCAF.a */,
-				0A7DEE161E2D2AC300267B9B /* libTKXDEIGES.a */,
-				0A7DEE171E2D2AC700267B9B /* libTKXDESTEP.a */,
 				0A7DEE181E2D2ACA00267B9B /* libTKXMesh.a */,
 				0A7DEE191E2D2ACE00267B9B /* libTKXml.a */,
 				0A7DEE1A1E2D2AD100267B9B /* libTKXmlL.a */,

samples/ios/UIKitSample/UIKitSample/CafShapePrs.h

@@ -23,12 +23,11 @@
 #define CafShapePrs_h
 
 #include <TDF_Label.hxx>
-#include <TDF_LabelMapHasher.hxx>
 #include <XCAFPrs_AISObject.hxx>
 #include <XCAFPrs_Style.hxx>
 
 typedef NCollection_DataMap<TopoDS_Shape, Handle(AIS_ColoredDrawer), TopTools_ShapeMapHasher> CafDataMapOfShapeColor;
-typedef NCollection_DataMap<TDF_Label, Handle(AIS_InteractiveObject), TDF_LabelMapHasher> MapOfPrsForShapes;
+typedef NCollection_DataMap<TDF_Label, Handle(AIS_InteractiveObject)> MapOfPrsForShapes;
 
 //! Interactive object for shape in DECAF document
 class CafShapePrs : public XCAFPrs_AISObject

samples/java/jniviewer/app/src/main/java/com/opencascade/jnisample/OcctJniActivity.java

@@ -138,11 +138,8 @@ public class OcctJniActivity extends Activity implements OnClickListener
      || !loadLibVerbose ("TKFillet",     aLoaded, aFailed)
      || !loadLibVerbose ("TKOffset",     aLoaded, aFailed)
      || !loadLibVerbose ("TKXSBase",     aLoaded, aFailed)
-     || !loadLibVerbose ("TKIGES",       aLoaded, aFailed)
-     || !loadLibVerbose ("TKSTEPBase",   aLoaded, aFailed)
-     || !loadLibVerbose ("TKSTEPAttr",   aLoaded, aFailed)
-     || !loadLibVerbose ("TKSTEP209",    aLoaded, aFailed)
-     || !loadLibVerbose ("TKSTEP",       aLoaded, aFailed)
+     || !loadLibVerbose ("TKDEIGES",       aLoaded, aFailed)
+     || !loadLibVerbose ("TKDESTEP",       aLoaded, aFailed)
         // OCCT Visualization
      || !loadLibVerbose ("TKService",    aLoaded, aFailed)
      || !loadLibVerbose ("TKHLR",        aLoaded, aFailed)

samples/java/jniviewer/app/src/main/jni/CMakeLists.txt

@@ -8,8 +8,8 @@ set (anOcctLibs
   # exchange
   TKPrim TKBO TKBool TKFillet TKOffset
   TKXSBase
-  TKIGES
-  TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP
+  TKDEIGES
+  TKDESTEP
   # OCCT Visualization
   TKService TKHLR TKV3d TKOpenGles
 )

samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj

@@ -116,7 +116,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\$(VCFMT)\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -159,7 +159,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\$(VCFMT)\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -202,7 +202,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\$(VCFMT)\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -246,7 +246,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../..\win64\$(VCFMT)\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

samples/mfc/standard/02_Modeling/CMakeLists.txt

@@ -61,4 +61,4 @@ include_directories (${CMAKE_BINARY_DIR}/inc
                      ${Modeling_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
-target_link_libraries (Modeling mfcsample TKSTEP209 TKSTEPAttr TKSTEPBase TKBO)
+target_link_libraries (Modeling mfcsample TKDESTEP TKBO)

samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj

@@ -115,7 +115,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBRep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\$(VCFMT)\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -157,7 +157,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBRep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\$(VCFMT)\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -200,7 +200,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBRep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\$(VCFMT)\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -242,7 +242,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBRep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\$(VCFMT)\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

samples/mfc/standard/03_ImportExport/adm/win/vc10/ImportExport.vcxproj

@@ -116,7 +116,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\$(VCFMT)\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -158,7 +158,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\$(VCFMT)\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -199,7 +199,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\$(VCFMT)\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -241,7 +241,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\$(VCFMT)\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\$(VCFMT)\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

samples/mfc/standard/mfcsample/CMakeLists.txt

@@ -158,15 +158,12 @@ include_directories( ${CMAKE_BINARY_DIR}/inc
                      ${COMMON_RESOURCE2D_DIR})
 
 # OCCT libraries for using
-set (mfcsample_USED_LIBS  TKVRML
-                          TKSTL
+set (mfcsample_USED_LIBS  TKDEVRML
+                          TKDESTL
                           TKBRep
-                          TKIGES
+                          TKDEIGES
                           TKShHealing
-                          TKSTEP
-                          TKSTEPBase
-                          TKSTEP209
-                          TKSTEPAttr
+                          TKDESTEP
                           TKXSBase
                           TKBool
                           TKBO

samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj

@@ -115,7 +115,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\$(VCFMT)\bind/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -158,7 +158,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\$(VCFMT)\bind/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -202,7 +202,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\$(VCFMT)\bin/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -246,7 +246,7 @@
       <ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVCAF.lib;TKDEVRML.lib;TKDESTL.lib;TKBrep.lib;TKDEIGES.lib;TKShHealing.lib;TKDESTEP.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;TKLCAF.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\$(VCFMT)\bin/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

samples/qt/IESample/EXTERNLIB

@@ -8,7 +8,7 @@ TKG3d
 TKGeomAlgo
 TKGeomBase
 TKHLR
-TKIGES
+TKDEIGES
 TKernel
 TKMath
 TKMesh
@@ -17,13 +17,10 @@ TKOpenGl
 TKPrim
 TKShHealing
 TKService
-TKSTEP
-TKSTEP209
-TKSTEPAttr
-TKSTEPBase
-TKSTL
+TKDESTEP
+TKDESTL
 TKTopAlgo
 TKV3d
-TKVRML
+TKDEVRML
 TKXSBase
 

samples/qt/IESample/IESample.pro

@@ -72,8 +72,8 @@ win32 {
 }
 
 LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \
-        -lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
-        -lTKSTEPBase -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
+        -lTKBRep -lTKDEIGES -lTKDESTL -lTKDEVRML -lTKDESTEP \
+        -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
         -lTKXSBase -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
         -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset -lTKLCAF \
 

samples/qt/OCCTOverview/EXTERNLIB

@@ -10,7 +10,7 @@ TKGeomAlgo
 TKGeomBase
 TKernel
 TKHLR
-TKIGES
+TKDEIGES
 TKMath
 TKMesh
 TKOffset
@@ -18,14 +18,11 @@ TKOpenGl
 TKPrim
 TKService
 TKShHealing
-TKSTEP
-TKSTEP209
-TKSTEPAttr
-TKSTEPBase
-TKSTL
+TKDESTEP
+TKDESTL
 TKTopAlgo
 TKV3d
-TKVRML
+TKDEVRML
 TKXSBase
 TKLCAF
 TKCAF

samples/qt/OCCTOverview/OCCTOverview.pro

@@ -75,8 +75,8 @@ win32 {
 }
 
 LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \
-        -lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
-        -lTKSTEPBase -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
+        -lTKBRep -lTKDEIGES -lTKDESTL -lTKDEVRML -lTKDESTEP \
+        -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
         -lTKXSBase -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
         -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset -lTKLCAF -lTKCAF -lTKVCAF \
 		-lTKBin -lTKXml

samples/qt/Tutorial/EXTERNLIB

@@ -9,7 +9,7 @@ TKGeomAlgo
 TKGeomBase
 TKernel
 TKHLR
-TKIGES
+TKDEIGES
 TKMath
 TKMesh
 TKOffset
@@ -17,13 +17,10 @@ TKOpenGl
 TKPrim
 TKService
 TKShHealing
-TKSTEP
-TKSTEP209
-TKSTEPAttr
-TKSTEPBase
-TKSTL
+TKDESTEP
+TKDESTL
 TKTopAlgo
 TKV3d
-TKVRML
+TKDEVRML
 TKXSBase
 

samples/qt/Tutorial/Tutorial.pro

@@ -73,8 +73,8 @@ win32 {
 }
 
 LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \
-        -lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
-        -lTKSTEPBase -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
+        -lTKBRep -lTKDEIGES -lTKDESTL -lTKDEVRML -lTKDESTEP \
+        -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
         -lTKXSBase -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
         -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset -lTKLCAF \
 

samples/webgl/CMakeLists.txt

@@ -59,7 +59,7 @@ else()
   set(OCCT_BIN_DIR)
 endif()
 
-set(OpenCASCADE_LIBS TKRWMesh TKBinXCAF TKBin TKBinL TKOpenGles TKXCAF TKVCAF TKCAF TKV3d TKHLR TKMesh TKService TKShHealing TKPrim TKTopAlgo TKGeomAlgo TKBRep TKGeomBase TKG3d TKG2d TKMath TKLCAF TKCDF TKernel)
+set(OpenCASCADE_LIBS TKRWMesh TKDEGLTF TKDEOBJ TKDEPLY TKBinXCAF TKBin TKBinL TKOpenGles TKXCAF TKVCAF TKCAF TKV3d TKHLR TKMesh TKService TKShHealing TKPrim TKTopAlgo TKGeomAlgo TKBRep TKGeomBase TKG3d TKG2d TKMath TKLCAF TKCDF TKernel)
 
 add_executable(${APP_TARGET} ${SOURCES})
 target_link_libraries(

samples/xaml/CMakeLists.txt

@@ -102,11 +102,11 @@ set (uwp_USED_LIBS        TKernel
                           TKHLR
                           TKOffset
                           TKXMesh
-                          TKIGES
-                          TKSTEP
+                          TKDEIGES
+                          TKDESTEP
                           TKXSBase
-                          TKSTL
-                          TKVRML
+                          TKDESTL
+                          TKDEVRML
                           )
 
 target_link_libraries (uwp ${uwp_USED_LIBS})

src/AIS/AIS_AttributeFilter.hxx

@@ -103,7 +103,7 @@ public:
 private:
 
   Quantity_NameOfColor myCol;
-  Standard_Real myWid{};
+  Standard_Real myWid;
   Standard_Boolean hasC;
   Standard_Boolean hasW;
 

src/AIS/AIS_Axis.cxx

@@ -14,8 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <AIS_Axis.hxx>
 
 #include <Aspect_TypeOfLine.hxx>
@@ -73,7 +71,7 @@ myTypeOfAxis(anAxisType),
 myIsXYZAxis(Standard_True)
 {
   Handle (Prs3d_DatumAspect) DA = new Prs3d_DatumAspect();
-  Standard_Real aLength = NAN;
+  Standard_Real aLength;
   try {
     aLength = UnitsAPI::AnyToLS(100. ,"mm");
   } catch (Standard_Failure const&) {
@@ -114,11 +112,11 @@ AIS_Axis::AIS_Axis(const Handle(Geom_Axis1Placement)& anAxis)
 //=======================================================================
 AIS_Axis::AIS_Axis (const gp_Ax1& theAxis, const Standard_Real theLength)
 : myComponent (new Geom_Line (theAxis)),
-  myPfirst(theAxis.Location()), myTypeOfAxis (AIS_TOAX_ZAxis),
-  myIsXYZAxis (Standard_True), myDir(theAxis.Direction())
+  myTypeOfAxis (AIS_TOAX_ZAxis),
+  myIsXYZAxis (Standard_True)
 {
-  
-  
+  myDir = theAxis.Direction();
+  myPfirst = theAxis.Location();
   if (theLength <= 0 && theLength != -1)
   {
     throw Standard_NumericError ("AIS_Axis::AIS_Axis : invalid value for theLength parameter");
@@ -276,7 +274,7 @@ void AIS_Axis::ComputeFields()
     const gp_Dir& oX   = anAxis.XDirection();
     const gp_Dir& oY   = anAxis.YDirection();
     const gp_Dir& oZ   = anAxis.Direction();
-    Standard_Real xo = NAN,yo = NAN,zo = NAN,x = 0.,y = 0.,z = 0.;
+    Standard_Real xo,yo,zo,x = 0.,y = 0.,z = 0.;
     Orig.Coord(xo,yo,zo);
     myPfirst.SetCoord(xo,yo,zo);
     

src/AIS/AIS_Axis.hxx

@@ -124,8 +124,8 @@ private:
   AIS_TypeOfAxis myTypeOfAxis;
   Standard_Boolean myIsXYZAxis;
   gp_Dir myDir;
-  Standard_Real myVal{};
-  Standard_CString myText{};
+  Standard_Real myVal;
+  Standard_CString myText;
   Handle(Prs3d_LineAspect) myLineAspect;
 
 };

src/AIS/AIS_BadEdgeFilter.cxx

@@ -28,9 +28,9 @@ IMPLEMENT_STANDARD_RTTIEXT(AIS_BadEdgeFilter,SelectMgr_Filter)
 //function : AIS_BadEdgeFilter
 //purpose  : 
 //=======================================================================
-AIS_BadEdgeFilter::AIS_BadEdgeFilter() : myContour(0)
+AIS_BadEdgeFilter::AIS_BadEdgeFilter()
 {
-  
+  myContour=0;
 }
 
 //=======================================================================

src/AIS/AIS_C0RegularityFilter.cxx

@@ -37,7 +37,7 @@ AIS_C0RegularityFilter::AIS_C0RegularityFilter(const TopoDS_Shape& aShape)
 {
   TopTools_IndexedDataMapOfShapeListOfShape SubShapes;
   TopExp::MapShapesAndAncestors(aShape,TopAbs_EDGE,TopAbs_FACE,SubShapes);
-  Standard_Boolean Ok = 0;
+  Standard_Boolean Ok;
   for (Standard_Integer i = 1; i <= SubShapes.Extent(); i++) {
     Ok = Standard_False;
     TopTools_ListIteratorOfListOfShape it(SubShapes(i));

src/AIS/AIS_ColoredShape.hxx

@@ -21,7 +21,6 @@
 #include <NCollection_IndexedDataMap.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopTools_MapOfShape.hxx>
-#include <TColStd_MapTransientHasher.hxx>
 
 class StdSelect_BRepOwner;
 
@@ -104,7 +103,7 @@ protected: //! @name override presentation computation
 
 protected:
 
-  typedef NCollection_IndexedDataMap<Handle(AIS_ColoredDrawer), TopoDS_Compound, TColStd_MapTransientHasher> DataMapOfDrawerCompd;
+  typedef NCollection_IndexedDataMap<Handle(AIS_ColoredDrawer), TopoDS_Compound> DataMapOfDrawerCompd;
 
 protected:
 

src/AIS/AIS_ConnectedInteractive.cxx

@@ -30,7 +30,6 @@
 #include <StdSelect.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_OrientedShapeMapHasher.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_ConnectedInteractive,AIS_InteractiveObject)
 
@@ -241,7 +240,7 @@ void AIS_ConnectedInteractive::computeSubShapeSelection (const Handle(SelectMgr_
                                                          const Standard_Integer theMode)
 {
   typedef NCollection_List<Handle(Select3D_SensitiveEntity)> SensitiveList;
-  typedef NCollection_DataMap<TopoDS_Shape, SensitiveList, TopTools_OrientedShapeMapHasher>
+  typedef NCollection_DataMap<TopoDS_Shape, SensitiveList>
     Shapes2EntitiesMap;
 
   if (!myReference->HasSelection (theMode))

src/AIS/AIS_DataMapOfIOStatus.hxx

@@ -19,11 +19,10 @@
 
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_GlobalStatus.hxx>
-#include <TColStd_MapTransientHasher.hxx>
 #include <NCollection_DataMap.hxx>
 
-typedef NCollection_DataMap<Handle(AIS_InteractiveObject),Handle(AIS_GlobalStatus),TColStd_MapTransientHasher> AIS_DataMapOfIOStatus;
-typedef NCollection_DataMap<Handle(AIS_InteractiveObject),Handle(AIS_GlobalStatus),TColStd_MapTransientHasher>::Iterator AIS_DataMapIteratorOfDataMapOfIOStatus;
+typedef NCollection_DataMap<Handle(AIS_InteractiveObject),Handle(AIS_GlobalStatus)> AIS_DataMapOfIOStatus;
+typedef NCollection_DataMap<Handle(AIS_InteractiveObject),Handle(AIS_GlobalStatus)>::Iterator AIS_DataMapIteratorOfDataMapOfIOStatus;
 
 
 #endif

src/AIS/AIS_DragAction.hxx

@@ -17,10 +17,11 @@
 //! Dragging action.
 enum AIS_DragAction
 {
-  AIS_DragAction_Start,  //!< (try) start dragging object
-  AIS_DragAction_Update, //!< perform dragging (update position)
-  AIS_DragAction_Stop,   //!< stop dragging (save position)
-  AIS_DragAction_Abort,  //!< abort dragging (restore initial position)
+  AIS_DragAction_Start,     //!< (try) start dragging object
+  AIS_DragAction_Confirmed, //!< dragging interaction is confirmed.
+  AIS_DragAction_Update,    //!< perform dragging (update position)
+  AIS_DragAction_Stop,      //!< stop dragging (save position)
+  AIS_DragAction_Abort,     //!< abort dragging (restore initial position)
 };
 
 #endif // _AIS_DragAction_HeaderFile

src/AIS/AIS_InteractiveContext.cxx

@@ -511,7 +511,7 @@ void AIS_InteractiveContext::Load (const Handle(AIS_InteractiveObject)& theIObj,
   setContextToObject (theIObj);
   if (!myObjects.IsBound (theIObj))
   {
-    Standard_Integer aDispMode = 0, aHiMod = 0, aSelModeDef = 0;
+    Standard_Integer aDispMode, aHiMod, aSelModeDef;
     GetDefModes (theIObj, aDispMode, aHiMod, aSelModeDef);
     setObjectStatus (theIObj, PrsMgr_DisplayStatus_Erased, aDispMode, theSelMode != -1 ? theSelMode : aSelModeDef);
     theIObj->ViewAffinity()->SetVisible (true); // reset view affinity mask

src/AIS/AIS_InteractiveContext.hxx

@@ -1453,7 +1453,7 @@ protected: //! @name internal fields
   Handle(SelectMgr_SelectionManager) mgrSelector;
   Handle(PrsMgr_PresentationManager) myMainPM;
   Handle(V3d_Viewer) myMainVwr;
-  V3d_View* myLastActiveView{};
+  V3d_View* myLastActiveView;
   Handle(SelectMgr_EntityOwner) myLastPicked;
   Standard_Boolean myToHilightSelected;
   Handle(AIS_Selection) mySelection;

src/AIS/AIS_LightSource.cxx

@@ -259,6 +259,10 @@ Standard_Boolean AIS_LightSource::ProcessDragging (const Handle(AIS_InteractiveC
       myLocTrsfStart = LocalTransformation();
       return Standard_True;
     }
+    case AIS_DragAction_Confirmed:
+    {
+      return Standard_True;
+    }
     case AIS_DragAction_Update:
     {
       mySensSphere->ResetLastDetectedPoint();

src/AIS/AIS_LightSource.hxx

@@ -256,7 +256,7 @@ protected:
   Handle(Graphic3d_AspectLine3d)   myArrowLineAspectShadow; //!< arrow shadow style
   Handle(Graphic3d_MarkerImage)    myMarkerImages[2];       //!< icon of disabled (0) and enabled (1) light
   Handle(Select3D_SensitiveSphere) mySensSphere;            //!< sensitive sphere of directional light source
-  Aspect_TypeOfMarker              myMarkerTypes[2]{};        //!< icon of disabled (0) and enabled (1) light
+  Aspect_TypeOfMarker              myMarkerTypes[2];        //!< icon of disabled (0) and enabled (1) light
   Aspect_TypeOfMarker              myCodirMarkerType;       //!< icon of arrow co-directional to camera direction (look from)
   Aspect_TypeOfMarker              myOpposMarkerType;       //!< icon of arrow opposite to camera direction (look at)
 

src/AIS/AIS_Manipulator.cxx

@@ -89,7 +89,7 @@ namespace
       ManipSensRotation (theCircle.Position().Direction()) {}
 
     //! Checks whether the circle overlaps current selecting volume
-    Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
+    virtual Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
                                       SelectBasics_PickResult& thePickResult) Standard_OVERRIDE
     {
       return isValidRay (theMgr)
@@ -108,7 +108,7 @@ namespace
       ManipSensRotation (thePlaneNormal) {}
 
     //! Checks whether the circle overlaps current selecting volume
-    Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
+    virtual Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
                                       SelectBasics_PickResult& thePickResult) Standard_OVERRIDE
     {
       return isValidRay (theMgr)
@@ -661,6 +661,10 @@ Standard_Boolean AIS_Manipulator::ProcessDragging (const Handle(AIS_InteractiveC
       }
       break;
     }
+    case AIS_DragAction_Confirmed:
+    {
+      return Standard_True;
+    }
     case AIS_DragAction_Update:
     {
       Transform (theDragTo.x(), theDragTo.y(), theView);

src/AIS/AIS_Plane.cxx

@@ -14,8 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <AIS_Plane.hxx>
 
 #include <AIS_InteractiveContext.hxx>
@@ -423,7 +421,7 @@ void AIS_Plane::SetMinimumSize (const Standard_Real theValue)
     UnsetMinimumSize();
     return;
   }
-  Standard_Real aX = NAN, anY = NAN;
+  Standard_Real aX, anY;
   Size (aX, anY);
   SetTransformPersistence (new Graphic3d_TransformPersScaledAbove (Min (aX, anY) / theValue, myCenter));
 }
@@ -520,7 +518,7 @@ void AIS_Plane::ComputeFrame()
 {
 
   const Handle(Geom_Plane)& pl = myComponent;
-  Standard_Real U = NAN,V = NAN;
+  Standard_Real U,V;
 
   if (myAutomaticPosition) {
     ElSLib::Parameters(pl->Pln(),myCenter,U,V);
@@ -553,7 +551,7 @@ void AIS_Plane::ComputeFields()
     gp_Dir oY = myAx2->Ax2().YDirection();
     gp_Dir oZ = myAx2->Ax2().Direction();
     myCenter = Orig;
-    Standard_Real xo = NAN,yo = NAN,zo = NAN,x1 = NAN,y1 = NAN,z1 = NAN,x2 = NAN,y2 = NAN,z2 = NAN,x3 = NAN,y3 = NAN,z3 = NAN,x4=0,y4=0,z4=0;
+    Standard_Real xo,yo,zo,x1,y1,z1,x2,y2,z2,x3,y3,z3,x4=0,y4=0,z4=0;
     Standard_Real x5=0,y5=0,z5=0;
     Orig.Coord(xo,yo,zo);
     oX.Coord(x1,y1,z1);

src/AIS/AIS_Plane.hxx

@@ -169,7 +169,7 @@ private:
   Standard_Boolean myAutomaticPosition;
   AIS_TypeOfPlane myTypeOfPlane;
   Standard_Boolean myIsXYZPlane;
-  Standard_Boolean myHasOwnSize{};
+  Standard_Boolean myHasOwnSize;
   Select3D_TypeOfSensitivity myTypeOfSensitivity;
 
 };

src/AIS/AIS_PlaneTrihedron.cxx

@@ -18,8 +18,6 @@
 // + (-1) selection mode token into account 
 // (SAMTECH specific)
 
-#include <math.h>
-
 #include <AIS_Line.hxx>
 #include <AIS_PlaneTrihedron.hxx>
 #include <AIS_Point.hxx>
@@ -155,7 +153,7 @@ void AIS_PlaneTrihedron::Compute (const Handle(PrsMgr_PresentationManager)& ,
   gp_Dir xDir = myPlane->Position().Ax2().XDirection();
 
   gp_Pnt orig = myPlane->Position().Ax2().Location();
-  Standard_Real xo = NAN,yo = NAN,zo = NAN,x = NAN,y = NAN,z = NAN;
+  Standard_Real xo,yo,zo,x,y,z;
   orig.Coord( xo, yo, zo );
   xDir.Coord( x, y, z );
   first.SetCoord( xo, yo, zo );
@@ -190,7 +188,7 @@ void AIS_PlaneTrihedron::Compute (const Handle(PrsMgr_PresentationManager)& ,
 void AIS_PlaneTrihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
 					     const Standard_Integer aMode)
 {
-  Standard_Integer Prior = 0;
+  Standard_Integer Prior;
   Handle(SelectMgr_EntityOwner) eown;
   TColgp_Array1OfPnt PP(1,4),PO(1,4);
 //  ExtremityPoints(PP);

src/AIS/AIS_Shape.cxx

@@ -14,8 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <AIS_Shape.hxx>
 
 #include <AIS_GraphicTool.hxx>
@@ -858,7 +856,7 @@ void AIS_Shape::SetOwnDeviationAngle (const Standard_Real theAngle)
 
 void AIS_Shape::SetAngleAndDeviation ( const Standard_Real  anAngle )
 {
-  Standard_Real OutAngl = NAN,OutDefl = NAN;
+  Standard_Real OutAngl,OutDefl;
   HLRBRep::PolyHLRAngleAndDeflection(anAngle,OutAngl,OutDefl);
   SetOwnDeviationAngle(anAngle) ;
   SetOwnDeviationCoefficient(OutDefl) ;

src/AIS/AIS_TextLabel.cxx

@@ -12,8 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <AIS_TextLabel.hxx>
 
 #include <AIS_InteractiveContext.hxx>
@@ -294,7 +292,7 @@ void AIS_TextLabel::Compute (const Handle(PrsMgr_PresentationManager)& ,
       }
 
       gp_Pnt aCenterOfLabel;
-      Standard_Real aWidth = NAN, aHeight = NAN;
+      Standard_Real aWidth, aHeight;
 
       Standard_Boolean isInit = calculateLabelParams (aPosition, aCenterOfLabel, aWidth, aHeight);
       if (myHasOrientation3D)
@@ -365,7 +363,7 @@ void AIS_TextLabel::ComputeSelection (const Handle(SelectMgr_Selection)& theSele
       }
 
       gp_Pnt aCenterOfLabel;
-      Standard_Real aWidth = NAN, aHeight = NAN;
+      Standard_Real aWidth, aHeight;
 
       if (!calculateLabelParams (aPosition, aCenterOfLabel, aWidth, aHeight))
       {

src/AIS/AIS_TexturedShape.cxx

@@ -13,8 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <AIS_TexturedShape.hxx>
 
 #include <AIS_GraphicTool.hxx>
@@ -268,8 +266,8 @@ void AIS_TexturedShape::updateAttributes (const Handle(Prs3d_Presentation)& theP
   myAspect = new Graphic3d_AspectFillArea3d (*myDrawer->ShadingAspect()->Aspect());
   if (HasPolygonOffsets())
   {
-    Standard_Integer aMode = 0;
-    Standard_ShortReal aFactor = NAN, aUnits = NAN;
+    Standard_Integer aMode;
+    Standard_ShortReal aFactor, aUnits;
     PolygonOffsets (aMode, aFactor, aUnits);
     myAspect->SetPolygonOffsets (aMode, aFactor, aUnits);
   }

src/AIS/AIS_Triangulation.cxx

@@ -27,12 +27,12 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_Triangulation,AIS_InteractiveObject)
 
-AIS_Triangulation::AIS_Triangulation(const Handle(Poly_Triangulation)& Triangulation) : myTriangulation(Triangulation), myNbNodes(Triangulation->NbNodes()), myNbTriangles(Triangulation->NbTriangles()), myFlagColor(0)
+AIS_Triangulation::AIS_Triangulation(const Handle(Poly_Triangulation)& Triangulation)
 {
-  
-  
-  
-  
+  myTriangulation = Triangulation;
+  myNbNodes       = Triangulation->NbNodes();
+  myNbTriangles   = Triangulation->NbTriangles();
+  myFlagColor     = 0;
 }
 
 //=======================================================================

src/AIS/AIS_Trihedron.hxx

@@ -241,7 +241,7 @@ protected:
   Standard_Boolean myHasOwnArrowColor;
 
   TCollection_ExtendedString myLabels[Prs3d_DatumParts_NB];
-  Standard_Integer mySelectionPriority[Prs3d_DatumParts_NB]{};
+  Standard_Integer mySelectionPriority[Prs3d_DatumParts_NB];
 
   Handle(Graphic3d_Group) myPartToGroup[Prs3d_DatumParts_NB];
   NCollection_List<Prs3d_DatumParts> mySelectedParts;

src/AIS/AIS_ViewController.cxx

@@ -332,6 +332,11 @@ void AIS_ViewController::flushBuffers (const Handle(AIS_InteractiveContext)& ,
       myGL.Dragging.ToStart = true;
       myGL.Dragging.PointStart = myUI.Dragging.PointStart;
     }
+    if (myUI.Dragging.ToConfirm)
+    {
+      myUI.Dragging.ToConfirm = false;
+      myGL.Dragging.ToConfirm = true;
+    }
     if (myUI.Dragging.ToMove)
     {
       myUI.Dragging.ToMove = false;
@@ -928,6 +933,7 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
       myMouseClickCounter = 0;
       myMouseSingleButton = -1;
       myMouseStopDragOnUnclick = true;
+      myUI.Dragging.ToConfirm = true;
     }
   }
 
@@ -1047,11 +1053,13 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
                             : 0.0;
       if (double (Abs (aDelta.x())) > aZoomTol)
       {
-        if (UpdateZoom (Aspect_ScrollDelta (aDelta.x())))
-        {
-          toUpdateView = true;
-        }
+        UpdateZoom (Aspect_ScrollDelta (aDelta.x()));
+
+        myUI.Dragging.ToMove  = true;
+        myUI.Dragging.PointTo = thePoint;
+
         myMouseProgressPoint = thePoint;
+        toUpdateView = true;
       }
       break;
     }
@@ -1075,7 +1083,6 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
         }
 
         aDelta.y() = -aDelta.y();
-        myMouseProgressPoint = thePoint;
         if (myUI.Panning.ToPan)
         {
           myUI.Panning.Delta += aDelta;
@@ -1085,6 +1092,12 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
           myUI.Panning.ToPan = true;
           myUI.Panning.Delta = aDelta;
         }
+
+        myUI.Dragging.ToMove  = true;
+        myUI.Dragging.PointTo = thePoint;
+
+        myMouseProgressPoint = thePoint;
+
         toUpdateView = true;
       }
       break;
@@ -2731,6 +2744,17 @@ void AIS_ViewController::OnObjectDragged (const Handle(AIS_InteractiveContext)&
       }
       return;
     }
+    case AIS_DragAction_Confirmed:
+    {
+      if (myDragObject.IsNull())
+      {
+        return;
+      }
+
+      myDragObject->ProcessDragging (theCtx, theView, myDragOwner, myGL.Dragging.PointStart,
+                                     myGL.Dragging.PointTo, theAction);
+      return;
+    }
     case AIS_DragAction_Update:
     {
       if (myDragObject.IsNull())
@@ -3050,9 +3074,15 @@ void AIS_ViewController::handleDynamicHighlight (const Handle(AIS_InteractiveCon
     }
     else if (myGL.Dragging.ToMove)
     {
+      if (myGL.Dragging.ToConfirm)
+      {
+        OnObjectDragged (theCtx, theView, AIS_DragAction_Confirmed);
+      }
       OnObjectDragged (theCtx, theView, AIS_DragAction_Update);
       myGL.OrbitRotation.ToRotate = false;
       myGL.ViewRotation .ToRotate = false;
+      myGL.Panning      .ToPan = false;
+      myGL.ZoomActions.Clear();
     }
   }
 }

src/AIS/AIS_ViewCube.hxx

@@ -640,18 +640,9 @@ protected:
 
 protected:
 
-  //! Trivial hasher to avoid ambiguity with enumeration type.
-  struct IntegerHasher
-  {
-    static Standard_Integer HashCode (Standard_Integer theValue, Standard_Integer theUpper) { return ::HashCode (theValue, theUpper); }
-    static Standard_Boolean IsEqual (Standard_Integer theA, Standard_Integer theB) { return theA == theB; }
-  };
-
-protected:
-
-  NCollection_DataMap<V3d_TypeOfOrientation, TCollection_AsciiString, IntegerHasher>
+  NCollection_DataMap<V3d_TypeOfOrientation, TCollection_AsciiString>
                                 myBoxSideLabels;     //!< map with box side labels
-  NCollection_DataMap<Prs3d_DatumParts, TCollection_AsciiString, IntegerHasher>
+  NCollection_DataMap<Prs3d_DatumParts, TCollection_AsciiString>
                                 myAxesLabels;        //!< map with axes labels
   Handle(Prs3d_ShadingAspect)   myBoxEdgeAspect;     //!< style for box edges
   Handle(Prs3d_ShadingAspect)   myBoxCornerAspect;   //!< style for box corner

src/AIS/AIS_ViewInputBuffer.hxx

@@ -87,13 +87,14 @@ public:
   struct _draggingParams
   {
     bool            ToStart;    //!< start dragging
+    bool            ToConfirm;  //!< confirm dragging
     bool            ToMove;     //!< perform dragging
     bool            ToStop;     //!< stop  dragging
     bool            ToAbort;    //!< abort dragging (restore previous position)
     Graphic3d_Vec2i PointStart; //!< drag start point
     Graphic3d_Vec2i PointTo;    //!< drag end point
 
-    _draggingParams() : ToStart (false), ToMove (false), ToStop (false), ToAbort (false) {}
+    _draggingParams() : ToStart (false), ToConfirm (false), ToMove (false), ToStop (false), ToAbort (false) {}
   } Dragging;
 
   struct _orbitRotation
@@ -139,12 +140,13 @@ public:
     Selection.ToApplyTool = false;
     IsNewGesture     = false;
     ZoomActions.Clear();
-    Panning.ToStart  = false;
-    Panning.ToPan    = false;
-    Dragging.ToStart = false;
-    Dragging.ToMove  = false;
-    Dragging.ToStop  = false;
-    Dragging.ToAbort = false;
+    Panning.ToStart    = false;
+    Panning.ToPan      = false;
+    Dragging.ToStart   = false;
+    Dragging.ToConfirm = false;
+    Dragging.ToMove    = false;
+    Dragging.ToStop    = false;
+    Dragging.ToAbort   = false;
     OrbitRotation.ToStart  = false;
     OrbitRotation.ToRotate = false;
     ViewRotation.ToStart   = false;

src/AIS/AIS_XRTrackedDevice.cxx

@@ -43,7 +43,7 @@ public:
   }
 
   //! Image reader.
-  Handle(Image_PixMap) GetImage (const Handle(Image_SupportedFormats)& theSupported) Standard_OVERRIDE
+  virtual Handle(Image_PixMap) GetImage (const Handle(Image_SupportedFormats)& theSupported) Standard_OVERRIDE
   {
     return myImageSource->ReadImage (theSupported);
   }

src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx

@@ -36,9 +36,9 @@ static Handle(TCollection_HAsciiString) nulstr;
 static Handle(Interface_HArray1OfHAsciiString) nularr;
 
 APIHeaderSection_MakeHeader::APIHeaderSection_MakeHeader
-  (const Handle(StepData_StepModel)& model) : done(Standard_True)
+  (const Handle(StepData_StepModel)& model)
 {
-  
+  done = Standard_True;
   if (model->HasHeaderEntity (STANDARD_TYPE(HeaderSection_FileName))) {
     fn = GetCasted(HeaderSection_FileName,
 		   model->HeaderEntity(STANDARD_TYPE(HeaderSection_FileName)));
@@ -384,7 +384,7 @@ void APIHeaderSection_MakeHeader::AddSchemaIdentifier(const Handle(TCollection_H
   Handle(Interface_HArray1OfHAsciiString) idents = fs->SchemaIdentifiers();
 
   // check that requested subschema is already in the list
-  Standard_Integer i = 0;
+  Standard_Integer i;
   for ( i=1; ! idents.IsNull() && i <= idents->Length(); i++ ) {
     if ( aSchem->IsSameString ( idents->Value(i) ) ) return;
   }

src/APIHeaderSection/APIHeaderSection_MakeHeader.hxx

@@ -185,7 +185,7 @@ private:
 
 
 
-  Standard_Boolean done{};
+  Standard_Boolean done;
   Handle(HeaderSection_FileName) fn;
   Handle(HeaderSection_FileSchema) fs;
   Handle(HeaderSection_FileDescription) fd;

src/Adaptor2d/Adaptor2d_OffsetCurve.cxx

@@ -224,7 +224,7 @@ void Adaptor2d_OffsetCurve::Intervals(TColStd_Array1OfReal& TI,
   Standard_Integer last = nbInter+1;
   while (T(last) >= myLast) last--;
 
-  Standard_Integer i = TI.Lower(), j = 0;
+  Standard_Integer i = TI.Lower(), j;
   for (j = first-1; j <= last+1; j++) {
     TI(i) = T(j);
     i++;

src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx

@@ -14,8 +14,6 @@
 #define No_Standard_OutOfRange
 
 
-#include <math.h>
-
 #include <Adaptor3d_CurveOnSurface.hxx>
 
 #include <Adaptor2d_Curve2d.hxx>
@@ -244,9 +242,9 @@ static void Locate1Coord(const Standard_Integer Index,
 			 const Handle(Geom_BSplineCurve)& BSplC,
 			 gp_Pnt2d& LeftBot, gp_Pnt2d& RightTop)
 {
-  Standard_Real Comp1=0, DComp1=0, cur = NAN, f = 0.0, l = 0.0;
+  Standard_Real Comp1=0, DComp1=0, cur, f = 0.0, l = 0.0;
   Standard_Real Tol = Precision::PConfusion()/10;
-  Standard_Integer i = 1, Bnd1 = 0, Bnd2 = 0;
+  Standard_Integer i = 1, Bnd1, Bnd2;
   Standard_Boolean DIsNull= Standard_False; 
   TColStd_Array1OfReal Arr(1,BSplC->NbKnots());  BSplC->Knots(Arr);
   
@@ -348,7 +346,7 @@ static void Locate1Coord(const Standard_Integer Index,
 {
   Standard_Real Comp1=0,DComp1=0; 
   Standard_Real Tol = Precision::PConfusion()/10;
-  Standard_Integer i=1, Up=0, Up1 = 0, Up2 = 0, Down=0, Down1 = 0, Down2 = 0;
+  Standard_Integer i=1, Up=0, Up1, Up2, Down=0, Down1, Down2;
   Standard_Real cur = 0.;
 
   DIsNull= Standard_False; 
@@ -877,7 +875,7 @@ Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals (const GeomAbs_Shape S) c
   if(S == myIntCont && !myIntervals.IsNull())
     return myIntervals->Length()-1;
   
-  Standard_Integer nu = 0,nv = 0,nc = 0;
+  Standard_Integer nu,nv,nc;
   nu=mySurface->NbUIntervals(S);
   nv=mySurface->NbVIntervals(S);
   nc=myCurve->NbIntervals(S);
@@ -889,7 +887,7 @@ Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals (const GeomAbs_Shape S) c
   TColStd_Array1OfReal TabC(TabBuf(nu + nv + 3), 1, nc+1);
 
   Standard_Integer NbSample = 20;
-  Standard_Real U = NAN,V = NAN,Tdeb = NAN,Tfin = NAN;
+  Standard_Real U,V,Tdeb,Tfin;
   Tdeb=myCurve->FirstParameter();
   Tfin=myCurve->LastParameter();
 
@@ -1236,7 +1234,7 @@ gp_Vec Adaptor3d_CurveOnSurface::DN
 Standard_Real Adaptor3d_CurveOnSurface::Resolution
   (const Standard_Real R3d) const
 {
-  Standard_Real ru = NAN,rv = NAN;
+  Standard_Real ru,rv;
   ru = mySurface->UResolution(R3d);
   rv = mySurface->VResolution(R3d);
   return myCurve->Resolution(Min(ru,rv)); 
@@ -1650,7 +1648,7 @@ void Adaptor3d_CurveOnSurface::EvalKPart()
 
 void Adaptor3d_CurveOnSurface::EvalFirstLastSurf()
 { 
-  Standard_Real FirstPar = NAN,LastPar = NAN;
+  Standard_Real FirstPar,LastPar;
   gp_Pnt2d UV, LeftBot, RightTop;
   gp_Vec2d DUV;
   Standard_Real Tol= Precision::PConfusion()/10;
@@ -1758,7 +1756,7 @@ Standard_Boolean Adaptor3d_CurveOnSurface::LocatePart_RevExt(const gp_Pnt2d& UV,
       Locate2Coord(1,UV,DUV,S->FirstUParameter(),S->LastUParameter(),LeftBot,RightTop);
     } 
 
-    Standard_Real u1 = NAN,u2 = NAN,v1 = NAN,v2 = NAN;
+    Standard_Real u1,u2,v1,v2;
     ReverseParam(LeftBot.X(),RightTop.X(),u1,u2);
     LeftBot.SetX(u1);
     RightTop.SetX(u2);

src/Adaptor3d/Adaptor3d_HSurfaceTool.cxx

@@ -13,8 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <Adaptor3d_HSurfaceTool.hxx>
 
 #include <Adaptor3d_Curve.hxx>
@@ -104,7 +102,7 @@ Standard_Boolean Adaptor3d_HSurfaceTool::IsSurfG1(const Handle(Adaptor3d_Surface
                                                   const Standard_Boolean theAlongU,
                                                   const Standard_Real theAngTol)
 {
-  Standard_Real aUf = NAN, aUl = NAN, aVf = NAN, aVl = NAN;
+  Standard_Real aUf, aUl, aVf, aVl;
   aUf = theSurf->FirstUParameter();
   aUl = theSurf->LastUParameter();
   aVf = theSurf->FirstVParameter();

src/Adaptor3d/Adaptor3d_InterFunc.cxx

@@ -14,8 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <Adaptor3d_InterFunc.hxx>
 
 #include <Adaptor2d_Curve2d.hxx>
@@ -42,7 +40,7 @@ Standard_Boolean Adaptor3d_InterFunc::Value(const Standard_Real X , Standard_Rea
 }
 Standard_Boolean Adaptor3d_InterFunc::Derivative(const Standard_Real X , Standard_Real& D)
 {
-   Standard_Real F = NAN;
+   Standard_Real F;
    return Values(X,F,D);
 }
 Standard_Boolean Adaptor3d_InterFunc::Values(const Standard_Real X , Standard_Real& F,Standard_Real& D)

src/Adaptor3d/Adaptor3d_IsoCurve.cxx

@@ -11,8 +11,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <Adaptor3d_IsoCurve.hxx>
 
 #include <Adaptor3d_Curve.hxx>
@@ -314,7 +312,7 @@ void Adaptor3d_IsoCurve::Intervals(TColStd_Array1OfReal& TI,
   Standard_Integer last = nbInter+1;
   while (T(last) >= myLast) last--;
 
-  Standard_Integer i = TI.Lower(), j = 0;
+  Standard_Integer i = TI.Lower(), j;
   for (j = first-1; j <= last+1; j++) {
     TI(i) = T(j);
     i++;
@@ -677,7 +675,7 @@ static void computeHR(const gp_Ax3&        axes,
 gp_Circ Adaptor3d_IsoCurve::Circle() const
 {
   gp_Ax3 axes;
-  Standard_Real radius = NAN,h = 0.;
+  Standard_Real radius,h = 0.;
 
   switch (mySurface->GetType()) {
     

src/Adaptor3d/Adaptor3d_TopolTool.cxx

@@ -11,8 +11,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <Adaptor3d_TopolTool.hxx>
 
 #include <Adaptor2d_Line2d.hxx>
@@ -60,7 +58,7 @@ void Adaptor3d_TopolTool::Initialize ()
 
 void Adaptor3d_TopolTool::Initialize (const Handle(Adaptor3d_Surface)& S)
 {
-  Standard_Real pinf = NAN,psup = NAN,deltap = NAN;
+  Standard_Real pinf,psup,deltap;
   //Adaptor2d_Line2d  * Line2dPtr ;
 
   myNbSamplesU=-1;
@@ -218,7 +216,7 @@ void Adaptor3d_TopolTool::Initialize(const Handle(Adaptor2d_Curve2d)& C)
 {
   nbVtx = 0;
   idVtx = 0;
-  Standard_Real theUinf = NAN,theUsup = NAN;
+  Standard_Real theUinf,theUsup;
   theUinf = C->FirstParameter();
   theUsup = C->LastParameter();
 //  if (!Precision::IsNegativeInfinite(theUinf)) {
@@ -282,7 +280,7 @@ TopAbs_State Adaptor3d_TopolTool::Classify(const gp_Pnt2d& P,
     return TopAbs_IN;
   }
   else {
-    Standard_Boolean dansu = 0,dansv = 0,surumin = 0,surumax = 0,survmin = 0,survmax = 0;
+    Standard_Boolean dansu,dansv,surumin,surumax,survmin,survmax;
     if (Precision::IsNegativeInfinite(Uinf) && 
 	    Precision::IsPositiveInfinite(Usup)) {
       dansu = Standard_True;
@@ -417,7 +415,7 @@ Standard_Boolean  Adaptor3d_TopolTool::IsThePointOn(const gp_Pnt2d& P,
     return(Standard_False);
   }
   else {
-    Standard_Boolean dansu = 0,dansv = 0,surumin = 0,surumax = 0,survmin = 0,survmax = 0;
+    Standard_Boolean dansu,dansv,surumin,surumax,survmin,survmax;
     if (Precision::IsNegativeInfinite(Uinf) && 
 	Precision::IsPositiveInfinite(Usup)) {
       dansu = Standard_True;
@@ -571,7 +569,7 @@ static void Analyse(const TColgp_Array2OfPnt& array2,
 		    Standard_Integer& myNbSamplesU,
 		    Standard_Integer& myNbSamplesV) { 
   gp_Vec Vi,Vip1;
-  Standard_Integer sh = 0,nbch = 0,i = 0,j = 0;
+  Standard_Integer sh,nbch,i,j;
   
   sh = 1;
   nbch = 0;
@@ -640,7 +638,7 @@ void Adaptor3d_TopolTool::ComputeSamplePoints()
 { 
   const Standard_Integer aMaxNbSample = 50;
 
-  Standard_Real uinf = NAN,usup = NAN,vinf = NAN,vsup = NAN;
+  Standard_Real uinf,usup,vinf,vsup;
   uinf = myS->FirstUParameter();  usup = myS->LastUParameter();
   vinf = myS->FirstVParameter();  vsup = myS->LastVParameter();
   if (usup < uinf) { Standard_Real temp=uinf; uinf=usup; usup=temp; }
@@ -653,7 +651,7 @@ void Adaptor3d_TopolTool::ComputeSamplePoints()
   else if (vinf == RealFirst()) { vinf=vsup-2.e5;  }
   else if (vsup == RealLast()) {  vsup=vinf+2.e5;  }
   
-  Standard_Integer nbsu = 0,nbsv = 0;
+  Standard_Integer nbsu,nbsv;
   GeomAbs_SurfaceType typS = myS->GetType();
   switch(typS) { 
   case GeomAbs_Plane:          { nbsv=2; nbsu=2; } break;
@@ -758,8 +756,8 @@ void Adaptor3d_TopolTool::SamplePoint(const Standard_Integer i,
 				      gp_Pnt2d& P2d,
 				      gp_Pnt& P3d)
 {
-  Standard_Integer iu = 0, iv = 0;
-  Standard_Real u = NAN, v = NAN;
+  Standard_Integer iu, iv;
+  Standard_Real u, v;
   if (myUPars.IsNull())
     {
       Standard_Real myDU=(Usup-Uinf)/(myNbSamplesU+1);
@@ -848,7 +846,7 @@ void Adaptor3d_TopolTool::SamplePnts(const Standard_Real theDefl,
 				     const Standard_Integer theNUmin,
 				     const Standard_Integer theNVmin)
 { 
-  Standard_Real uinf = NAN,usup = NAN,vinf = NAN,vsup = NAN;
+  Standard_Real uinf,usup,vinf,vsup;
   uinf = myS->FirstUParameter();  usup = myS->LastUParameter();
   vinf = myS->FirstVParameter();  vsup = myS->LastVParameter();
   if (usup < uinf) { Standard_Real temp=uinf; uinf=usup; usup=temp; }
@@ -908,8 +906,8 @@ void Adaptor3d_TopolTool::SamplePnts(const Standard_Real theDefl,
 
   myUPars = new TColStd_HArray1OfReal(1, myNbSamplesU);
   myVPars = new TColStd_HArray1OfReal(1, myNbSamplesV);
-  Standard_Integer i = 0;
-  Standard_Real t = NAN, dt = (usup - uinf)/(myNbSamplesU - 1);
+  Standard_Integer i;
+  Standard_Real t, dt = (usup - uinf)/(myNbSamplesU - 1);
   myUPars->SetValue(1, uinf);
   myUPars->SetValue(myNbSamplesU, usup);
   for(i = 2, t = uinf+dt; i < myNbSamplesU; ++i, t += dt) {
@@ -938,12 +936,12 @@ void Adaptor3d_TopolTool::BSplSamplePnts(const Standard_Real theDefl,
 { 
   const Standard_Integer aMaxPnts = 1001;
   const Handle(Geom_BSplineSurface)& aBS = myS->BSpline();
-  Standard_Real uinf = NAN,usup = NAN,vinf = NAN,vsup = NAN;
+  Standard_Real uinf,usup,vinf,vsup;
   uinf = myS->FirstUParameter();  usup = myS->LastUParameter();
   vinf = myS->FirstVParameter();  vsup = myS->LastVParameter();
 
-  Standard_Integer i = 0, k = 0, j = 1;
-  Standard_Real t1 = NAN, t2 = NAN, dt = NAN;
+  Standard_Integer i, k, j = 1;
+  Standard_Real t1, t2, dt;
   Standard_Integer ui1 = aBS->FirstUKnotIndex();
   Standard_Integer ui2 = aBS->LastUKnotIndex();
   Standard_Integer vi1 = aBS->FirstVKnotIndex();
@@ -984,7 +982,7 @@ void Adaptor3d_TopolTool::BSplSamplePnts(const Standard_Real theDefl,
 
   //modified by NIZHNY-EMV Mon Jun 10 14:19:04 2013
   if (nbsu < theNUmin || nbsv < theNVmin) {
-    Standard_Integer aNb = 0;
+    Standard_Integer aNb;
     if (nbsu < nbsv) {
       aNb = (Standard_Integer)(nbsv * ((Standard_Real)theNUmin)/((Standard_Real)nbsu));
       aNb = Min(aNb, 30);
@@ -1098,7 +1096,7 @@ void Adaptor3d_TopolTool::BSplSamplePnts(const Standard_Real theDefl,
 
   Standard_Real aDefl2 = Max(theDefl*theDefl, 1.e-9);
   Standard_Real tol = Max(0.01*aDefl2, 1.e-9);
-  Standard_Integer l = 0;
+  Standard_Integer l;
 
   anUFlg(1) = Standard_True;
   anUFlg(nbsu) = Standard_True;
@@ -1272,7 +1270,7 @@ void Adaptor3d_TopolTool::BSplSamplePnts(const Standard_Real theDefl,
   //
   //modified by NIZNHY-PKV Fri Dec 16 10:05:01 2011f
   //
-  Standard_Boolean bFlag = 0;
+  Standard_Boolean bFlag;
   //
   // U 
   bFlag=(myNbSamplesU < theNUmin);

src/Adaptor3d/Adaptor3d_TopolTool.hxx

@@ -157,22 +157,22 @@ public:
 protected:
 
   Handle(Adaptor3d_Surface) myS;
-  Standard_Integer myNbSamplesU{};
-  Standard_Integer myNbSamplesV{};
+  Standard_Integer myNbSamplesU;
+  Standard_Integer myNbSamplesV;
   Handle(TColStd_HArray1OfReal) myUPars;
   Handle(TColStd_HArray1OfReal) myVPars;
 
 private:
 
-  Standard_Integer nbRestr{};
-  Standard_Integer idRestr{};
-  Standard_Real Uinf{};
-  Standard_Real Usup{};
-  Standard_Real Vinf{};
-  Standard_Real Vsup{};
+  Standard_Integer nbRestr;
+  Standard_Integer idRestr;
+  Standard_Real Uinf;
+  Standard_Real Usup;
+  Standard_Real Vinf;
+  Standard_Real Vsup;
   Handle(Adaptor2d_Line2d) myRestr[4];
-  Standard_Integer nbVtx{};
-  Standard_Integer idVtx{};
+  Standard_Integer nbVtx;
+  Standard_Integer idVtx;
   Handle(Adaptor3d_HVertex) myVtx[2];
 
 };

src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx

@@ -14,8 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <AdvApp2Var_ApproxAFunc2Var.hxx>
 #include <AdvApp2Var_EvaluatorFunc2Var.hxx>
 #include <AdvApp2Var_Criterion.hxx>
@@ -173,7 +171,7 @@ AdvApp2Var_ApproxAFunc2Var::AdvApp2Var_ApproxAFunc2Var(
 
 void AdvApp2Var_ApproxAFunc2Var::Init()
 {
-  Standard_Integer ifav = 0,iu=0,iv=0,ndu = 0,ndv = 0;
+  Standard_Integer ifav,iu=0,iv=0,ndu,ndv;
   switch (myFavoriteIso) {
   case GeomAbs_IsoU :
     ifav = 1;
@@ -241,7 +239,7 @@ void AdvApp2Var_ApproxAFunc2Var::Init()
 
 void AdvApp2Var_ApproxAFunc2Var::InitGrid(const Standard_Integer NbInt)
 {
-  Standard_Integer iu=myConditions.UOrder(),iv=myConditions.VOrder(),iint = 0;
+  Standard_Integer iu=myConditions.UOrder(),iv=myConditions.VOrder(),iint;
 
   Handle(AdvApp2Var_Patch) M0 = new AdvApp2Var_Patch (myFirstParInU,myLastParInU,myFirstParInV,myLastParInV,iu,iv);
 
@@ -348,10 +346,10 @@ void AdvApp2Var_ApproxAFunc2Var::ComputePatches(const AdvApprox_Cutting& UChoice
 						const AdvApprox_Cutting& VChoice,
 					 const AdvApp2Var_EvaluatorFunc2Var& Func)
 {
-  Standard_Real Udec = NAN, Vdec = NAN;
-  Standard_Boolean Umore = 0, Vmore = 0;
-  Standard_Integer NbPatch = 0, NbU = 0, NbV = 0, NumDec = 0;
-  Standard_Integer FirstNA = 0;
+  Standard_Real Udec, Vdec;
+  Standard_Boolean Umore, Vmore;
+  Standard_Integer NbPatch, NbU, NbV, NumDec;
+  Standard_Integer FirstNA;
 
   while (myResult.FirstNotApprox(FirstNA)) {
 
@@ -439,10 +437,10 @@ void AdvApp2Var_ApproxAFunc2Var::ComputePatches(const AdvApprox_Cutting& UChoice
 					 const AdvApp2Var_EvaluatorFunc2Var& Func,
 					 const AdvApp2Var_Criterion& Crit)
 {
-  Standard_Real Udec = NAN, Vdec = NAN, CritValue = NAN, m1=0.;
-  Standard_Boolean Umore = 0, Vmore = 0, CritAbs = (Crit.Type() == AdvApp2Var_Absolute);
-  Standard_Integer NbPatch = 0, NbU = 0, NbV = 0, NbInt = 0, NumDec = 0;
-  Standard_Integer FirstNA = 0, decision=0;
+  Standard_Real Udec, Vdec, CritValue, m1=0.;
+  Standard_Boolean Umore, Vmore, CritAbs = (Crit.Type() == AdvApp2Var_Absolute);
+  Standard_Integer NbPatch, NbU, NbV, NbInt, NumDec;
+  Standard_Integer FirstNA, decision=0;
 
   while (myResult.FirstNotApprox(FirstNA)) {
 
@@ -553,9 +551,9 @@ void AdvApp2Var_ApproxAFunc2Var::ComputeConstraints(const AdvApprox_Cutting& UCh
 					 const AdvApprox_Cutting& VChoice,
 					 const AdvApp2Var_EvaluatorFunc2Var& Func)
 {
-  Standard_Real dec = NAN;
-  Standard_Boolean more = 0;
-  Standard_Integer ind1 = 0, ind2 = 0, NbPatch = 0, NbU = 0, NbV = 0;
+  Standard_Real dec;
+  Standard_Boolean more;
+  Standard_Integer ind1, ind2, NbPatch, NbU, NbV;
   Standard_Integer iu = myConditions.UOrder(), iv = myConditions.VOrder();
   AdvApp2Var_Node N1(iu,iv), N2(iu,iv);
 
@@ -640,10 +638,10 @@ void AdvApp2Var_ApproxAFunc2Var::ComputeConstraints(const AdvApprox_Cutting& UCh
 					 const AdvApp2Var_EvaluatorFunc2Var& Func,
 					 const AdvApp2Var_Criterion& Crit)
 {
-  Standard_Real dec = NAN;
-  Standard_Boolean more = 0, CritRel = (Crit.Type() == AdvApp2Var_Relative);
-  Standard_Integer ind1 = 0, ind2 = 0, NbPatch = 0, NbU = 0, NbV = 0;
-  Standard_Integer indN1 = 0, indN2 = 0;
+  Standard_Real dec;
+  Standard_Boolean more, CritRel = (Crit.Type() == AdvApp2Var_Relative);
+  Standard_Integer ind1, ind2, NbPatch, NbU, NbV;
+  Standard_Integer indN1, indN2;
   Standard_Integer iu = myConditions.UOrder(), iv = myConditions.VOrder();
   AdvApp2Var_Node N1(iu,iv), N2(iu,iv);
 
@@ -729,9 +727,9 @@ void AdvApp2Var_ApproxAFunc2Var::ComputeConstraints(const AdvApprox_Cutting& UCh
 void AdvApp2Var_ApproxAFunc2Var::Compute3DErrors()
 {
 
-  Standard_Integer iesp = 0,ipat = 0;
-  Standard_Real error_max = NAN,error_moy = NAN,error_U0 = NAN,error_V0 = NAN,error_U1 = NAN,error_V1 = NAN;
-  Standard_Real Tol = NAN,F1Tol = NAN,F2Tol = NAN,F3Tol = NAN,F4Tol = NAN;
+  Standard_Integer iesp,ipat;
+  Standard_Real error_max,error_moy,error_U0,error_V0,error_U1,error_V1;
+  Standard_Real Tol,F1Tol,F2Tol,F3Tol,F4Tol;
   if ( myNumSubSpaces[2] > 0 ) {
     my3DMaxError = new (TColStd_HArray1OfReal) (1,myNumSubSpaces[2]);
     my3DAverageError = new (TColStd_HArray1OfReal) (1,myNumSubSpaces[2]);
@@ -780,8 +778,8 @@ void AdvApp2Var_ApproxAFunc2Var::Compute3DErrors()
 void AdvApp2Var_ApproxAFunc2Var::ComputeCritError()
 {
 
-  Standard_Integer iesp = 0,ipat = 0;
-  Standard_Real crit_max = NAN;
+  Standard_Integer iesp,ipat;
+  Standard_Real crit_max;
   if ( myNumSubSpaces[2] > 0 ) {
     for (iesp=1;iesp<=myNumSubSpaces[2];iesp++) {
       crit_max = 0.;
@@ -810,7 +808,7 @@ void AdvApp2Var_ApproxAFunc2Var::ConvertBS()
  // Calculate resulting surfaces 
   mySurfaces = new ( TColGeom_HArray1OfSurface) (1,  myNumSubSpaces[2]);
 
-  Standard_Integer j = 0;
+  Standard_Integer j;
   TColStd_Array1OfReal UKnots (1, myResult.NbPatchInU()+1);
   for (j=1; j<=UKnots.Length(); j++) { UKnots.SetValue(j, myResult.UParameter(j)); } 
  
@@ -842,11 +840,11 @@ void AdvApp2Var_ApproxAFunc2Var::ConvertBS()
   Handle(TColStd_HArray1OfReal) Poly = 
     new (TColStd_HArray1OfReal) (1, nmax * Size_eq);
 
-  Standard_Integer SSP = 0, i = 0;
+  Standard_Integer SSP, i;
   for (SSP=1; SSP <= myNumSubSpaces[2]; SSP++) { 
 
     // Creation of the grid of polynoms
-    Standard_Integer n=0,icf=1,ieq = 0;
+    Standard_Integer n=0,icf=1,ieq;
     for (j=1; j<=myResult.NbPatchInV(); j++) {
       for (i=1; i<=myResult.NbPatchInU(); i++) {
 	n++;
@@ -1066,7 +1064,7 @@ Standard_Real
 
 void AdvApp2Var_ApproxAFunc2Var::Dump(Standard_OStream& o) const 
 {
-  Standard_Integer iesp=1,NbKU = 0,NbKV = 0,ik = 0;
+  Standard_Integer iesp=1,NbKU,NbKV,ik;
   o<<std::endl;
   if (!myHasResult) { o<<"No result"<<std::endl; }
   else {

src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.hxx

@@ -193,7 +193,7 @@ private:
   Standard_EXPORT void ConvertBS();
 
 
-  Standard_Integer myNumSubSpaces[3]{};
+  Standard_Integer myNumSubSpaces[3];
   Handle(TColStd_HArray1OfReal) my1DTolerances;
   Handle(TColStd_HArray1OfReal) my2DTolerances;
   Handle(TColStd_HArray1OfReal) my3DTolerances;

src/AdvApp2Var/AdvApp2Var_ApproxF2var.cxx

@@ -11,8 +11,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <math.h>
-
 #include <AdvApp2Var_SysBase.hxx>
 #include <AdvApp2Var_MathBase.hxx>
 #include <AdvApp2Var_Data_f2c.hxx>
@@ -277,15 +275,15 @@ int mma1cdi_(integer *ndimen,
   integer c__1 = 1;
 
   /* System generated locals */
-  integer contr1_dim1 = 0, contr1_offset = 0, contr2_dim1 = 0, contr2_offset = 0, 
-  somtab_dim1 = 0, somtab_offset = 0, diftab_dim1 = 0, diftab_offset = 0, 
-  fpntab_dim1 = 0, fpntab_offset = 0, hermit_dim1 = 0, hermit_offset = 0, i__1 = 0, 
-  i__2 = 0, i__3 = 0;
+  integer contr1_dim1, contr1_offset, contr2_dim1, contr2_offset, 
+  somtab_dim1, somtab_offset, diftab_dim1, diftab_offset, 
+  fpntab_dim1, fpntab_offset, hermit_dim1, hermit_offset, i__1, 
+  i__2, i__3;
 
   /* Local variables */
-  integer nroo2 = 0, ncfhe = 0, nd = 0, ii = 0, kk = 0;
-  integer ibb = 0, kkm = 0, kkp = 0;
-  doublereal bid1 = NAN, bid2 = NAN, bid3 = 0.;
+  integer nroo2, ncfhe, nd, ii, kk;
+  integer ibb, kkm, kkp;
+  doublereal bid1, bid2, bid3 = 0.;
 
 /* ********************************************************************** 
 */
@@ -497,13 +495,13 @@ int mma1cnt_(integer *ndimen,
 	     doublereal *crvjac)
 {
   /* System generated locals */
-  integer contr1_dim1 = 0, contr1_offset = 0, contr2_dim1 = 0, contr2_offset = 0, 
-  hermit_dim1 = 0, hermit_offset = 0, crvjac_dim1 = 0, crvjac_offset = 0, i__1 = 0, 
-  i__2 = 0, i__3 = 0;
+  integer contr1_dim1, contr1_offset, contr2_dim1, contr2_offset, 
+  hermit_dim1, hermit_offset, crvjac_dim1, crvjac_offset, i__1, 
+  i__2, i__3;
 
   /* Local variables */
-  integer nd = 0, ii = 0, jj = 0, ibb = 0;
-  doublereal bid = NAN;
+  integer nd, ii, jj, ibb;
+  doublereal bid;
 
 
   /* ***********************************************************************
@@ -634,16 +632,16 @@ int mma1fdi_(integer *ndimen,
 	     integer *iercod)
 {
   /* System generated locals */
-  integer fpntab_dim1 = 0, somtab_dim1 = 0, somtab_offset = 0, diftab_dim1 = 0, 
-  diftab_offset = 0, contr1_dim1 = 0, contr1_offset = 0, contr2_dim1 = 0, 
-  contr2_offset = 0, i__1 = 0, i__2 = 0;
-  doublereal d__1 = NAN;
+  integer fpntab_dim1, somtab_dim1, somtab_offset, diftab_dim1, 
+  diftab_offset, contr1_dim1, contr1_offset, contr2_dim1, 
+  contr2_offset, i__1, i__2;
+  doublereal d__1;
 
   /* Local variables */
-  integer ideb = 0, ifin = 0, nroo2 = 0, ideru = 0, iderv = 0;
-  doublereal renor = NAN;
-  integer ii = 0, nd = 0, ibb = 0, iim = 0, nbp = 0, iip = 0;
-  doublereal bid1 = NAN, bid2 = NAN;
+  integer ideb, ifin, nroo2, ideru, iderv;
+  doublereal renor;
+  integer ii, nd, ibb, iim, nbp, iip;
+  doublereal bid1, bid2;
 
 /* ********************************************************************** 
 */
@@ -964,11 +962,11 @@ int mma1fer_(integer *,//ndimen,
 	     integer *iercod)
 {
   /* System generated locals */
-  integer crvjac_dim1 = 0, crvjac_offset = 0, i__1 = 0, i__2 = 0;
+  integer crvjac_dim1, crvjac_offset, i__1, i__2;
 
   /* Local variables */
-  integer idim = 0, ncfja = 0, ncfnw = 0, ndses = 0, ii = 0, kk = 0, ibb = 0, ier = 0;
-  integer nbr0 = 0;
+  integer idim, ncfja, ncfnw, ndses, ii, kk, ibb, ier;
+  integer nbr0;
 
 
 /* ***********************************************************************
@@ -1158,10 +1156,10 @@ int AdvApp2Var_ApproxF2var::mma1her_(const integer *iordre,
 				     integer *iercod)
 {
   /* System generated locals */
-  integer hermit_dim1 = 0, hermit_offset = 0;
+  integer hermit_dim1, hermit_offset;
 
   /* Local variables */
-  integer ibb = 0;
+  integer ibb;
 
 
 
@@ -1325,11 +1323,11 @@ int mma1jak_(integer *ndimen,
 	     integer *iercod)
 {
   /* System generated locals */
-  integer somtab_dim1 = 0, somtab_offset = 0, diftab_dim1 = 0, diftab_offset = 0, 
-  crvjac_dim1 = 0, crvjac_offset = 0;
+  integer somtab_dim1, somtab_offset, diftab_dim1, diftab_offset, 
+  crvjac_dim1, crvjac_offset;
 
   /* Local variables */
-  integer ibb = 0;
+  integer ibb;
 
 /* ********************************************************************** 
 */
@@ -1439,13 +1437,13 @@ int mma1noc_(doublereal *dfuvin,
 	     doublereal *cntout)
 {
   /* System generated locals */
-  integer i__1 = 0;
-  doublereal d__1 = NAN;
+  integer i__1;
+  doublereal d__1;
 
   /* Local variables */
-  doublereal rider = NAN, riord = NAN;
-  integer nd = 0, ibb = 0;
-  doublereal bid = NAN;
+  doublereal rider, riord;
+  integer nd, ibb;
+  doublereal bid;
 /* ********************************************************************** 
 */
 
@@ -1573,11 +1571,11 @@ int mma1nop_(integer *nbroot,
 
 {
   /* System generated locals */
-  integer i__1 = 0;
+  integer i__1;
 
   /* Local variables */
-  doublereal alinu = NAN, blinu = NAN, alinv = NAN, blinv = NAN;
-  integer ii = 0, ibb = 0;
+  doublereal alinu, blinu, alinv, blinv;
+  integer ii, ibb;
 
 /* ***********************************************************************
  */
@@ -1688,18 +1686,18 @@ int AdvApp2Var_ApproxF2var::mma2ac1_(integer const *ndimen,
 
 {
   /* System generated locals */
-  integer contr1_dim1 = 0, contr1_dim2 = 0, contr1_offset = 0, contr2_dim1 = 0, contr2_dim2 = 0,
-  contr2_offset = 0, contr3_dim1 = 0, contr3_dim2 = 0, contr3_offset = 0, 
-  contr4_dim1 = 0, contr4_dim2 = 0, contr4_offset = 0, uhermt_dim1 = 0, 
-  uhermt_offset = 0, vhermt_dim1 = 0, vhermt_offset = 0, patjac_dim1 = 0, 
-  patjac_dim2 = 0, patjac_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0, i__4 = 0, i__5 = 0;
+  integer contr1_dim1, contr1_dim2, contr1_offset, contr2_dim1, contr2_dim2,
+  contr2_offset, contr3_dim1, contr3_dim2, contr3_offset, 
+  contr4_dim1, contr4_dim2, contr4_offset, uhermt_dim1, 
+  uhermt_offset, vhermt_dim1, vhermt_offset, patjac_dim1, 
+  patjac_dim2, patjac_offset, i__1, i__2, i__3, i__4, i__5;
 
   /* Local variables */
-  logical ldbg = 0;
-  integer ndgu = 0, ndgv = 0;
-  doublereal bidu1 = NAN, bidu2 = NAN, bidv1 = NAN, bidv2 = NAN;
-  integer ioru1 = 0, iorv1 = 0, ii = 0, nd = 0, jj = 0, ku = 0, kv = 0;
-  doublereal cnt1 = NAN, cnt2 = NAN, cnt3 = NAN, cnt4 = NAN;
+  logical ldbg;
+  integer ndgu, ndgv;
+  doublereal bidu1, bidu2, bidv1, bidv2;
+  integer ioru1, iorv1, ii, nd, jj, ku, kv;
+  doublereal cnt1, cnt2, cnt3, cnt4;
 
 /* ********************************************************************** 
 */
@@ -1855,14 +1853,14 @@ int AdvApp2Var_ApproxF2var::mma2ac2_(const integer *ndimen,
 
 {
   /* System generated locals */
-  integer crbiv1_dim1 = 0, crbiv1_dim2 = 0, crbiv1_offset = 0, crbiv2_dim1 = 0, crbiv2_dim2 = 0,
-  crbiv2_offset = 0, patjac_dim1 = 0, patjac_dim2 = 0, patjac_offset = 0, 
-  vhermt_dim1 = 0, vhermt_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0, i__4 = 0;
+  integer crbiv1_dim1, crbiv1_dim2, crbiv1_offset, crbiv2_dim1, crbiv2_dim2,
+  crbiv2_offset, patjac_dim1, patjac_dim2, patjac_offset, 
+  vhermt_dim1, vhermt_offset, i__1, i__2, i__3, i__4;
 
   /* Local variables */
-  logical ldbg = 0;
-  integer ndgv1 = 0, ndgv2 = 0, ii = 0, jj = 0, nd = 0, kk = 0;
-  doublereal bid1 = NAN, bid2 = NAN;
+  logical ldbg;
+  integer ndgv1, ndgv2, ii, jj, nd, kk;
+  doublereal bid1, bid2;
 
 /* ********************************************************************** 
 */
@@ -2001,14 +1999,14 @@ int AdvApp2Var_ApproxF2var::mma2ac3_(const integer *ndimen,
 
 {
   /* System generated locals */
-  integer crbiu1_dim1 = 0, crbiu1_dim2 = 0, crbiu1_offset = 0, crbiu2_dim1 = 0, crbiu2_dim2 = 0,
-  crbiu2_offset = 0, patjac_dim1 = 0, patjac_dim2 = 0, patjac_offset = 0, 
-  uhermt_dim1 = 0, uhermt_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0, i__4 = 0;
+  integer crbiu1_dim1, crbiu1_dim2, crbiu1_offset, crbiu2_dim1, crbiu2_dim2,
+  crbiu2_offset, patjac_dim1, patjac_dim2, patjac_offset, 
+  uhermt_dim1, uhermt_offset, i__1, i__2, i__3, i__4;
 
   /* Local variables */
-  logical ldbg = 0;
-  integer ndgu1 = 0, ndgu2 = 0, ii = 0, jj = 0, nd = 0, kk = 0;
-  doublereal bid1 = NAN, bid2 = NAN;
+  logical ldbg;
+  integer ndgu1, ndgu2, ii, jj, nd, kk;
+  doublereal bid1, bid2;
 
 /* ********************************************************************** 
 */
@@ -2148,12 +2146,12 @@ int AdvApp2Var_ApproxF2var::mma2can_(const integer *ncfmxu,
 
 {
   /* System generated locals */
-  integer patjac_dim1 = 0, patjac_dim2 = 0, patjac_offset = 0, patcan_dim1 = 0, patcan_dim2 = 0,
-  patcan_offset = 0, i__1 = 0, i__2 = 0;
+  integer patjac_dim1, patjac_dim2, patjac_offset, patcan_dim1, patcan_dim2,
+  patcan_offset, i__1, i__2;
 
   /* Local variables */
-  logical ldbg = 0;
-  integer ilon1 = 0, ilon2 = 0, ii = 0, nd = 0;
+  logical ldbg;
+  integer ilon1, ilon2, ii, nd;
 
 /* ********************************************************************** 
 */
@@ -2308,21 +2306,21 @@ int mma2cd1_(integer *ndimen,
   integer c__1 = 1;
 
 /* System generated locals */
-    integer contr1_dim1 = 0, contr1_dim2 = 0, contr1_offset = 0, contr2_dim1 = 0, contr2_dim2 = 0,
-	     contr2_offset = 0, contr3_dim1 = 0, contr3_dim2 = 0, contr3_offset = 0, 
-	    contr4_dim1 = 0, contr4_dim2 = 0, contr4_offset = 0, uhermt_dim1 = 0, 
-	    uhermt_offset = 0, vhermt_dim1 = 0, vhermt_offset = 0, fpntbu_dim1 = 0, 
-	    fpntbu_offset = 0, fpntbv_dim1 = 0, fpntbv_offset = 0, sosotb_dim1 = 0, 
-	    sosotb_dim2 = 0, sosotb_offset = 0, diditb_dim1 = 0, diditb_dim2 = 0, 
-	    diditb_offset = 0, soditb_dim1 = 0, soditb_dim2 = 0, soditb_offset = 0, 
-	    disotb_dim1 = 0, disotb_dim2 = 0, disotb_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0, i__4 = 0, 
-	    i__5 = 0;
+    integer contr1_dim1, contr1_dim2, contr1_offset, contr2_dim1, contr2_dim2,
+	     contr2_offset, contr3_dim1, contr3_dim2, contr3_offset, 
+	    contr4_dim1, contr4_dim2, contr4_offset, uhermt_dim1, 
+	    uhermt_offset, vhermt_dim1, vhermt_offset, fpntbu_dim1, 
+	    fpntbu_offset, fpntbv_dim1, fpntbv_offset, sosotb_dim1, 
+	    sosotb_dim2, sosotb_offset, diditb_dim1, diditb_dim2, 
+	    diditb_offset, soditb_dim1, soditb_dim2, soditb_offset, 
+	    disotb_dim1, disotb_dim2, disotb_offset, i__1, i__2, i__3, i__4, 
+	    i__5;
 
     /* Local variables */
-    integer ncfhu = 0, ncfhv = 0, nuroo = 0, nvroo = 0, nd = 0, ii = 0, jj = 0, kk = 0, ll = 0, ibb = 0, kkm = 0, 
-	    llm = 0, kkp = 0, llp = 0;
-    doublereal bid1 = NAN, bid2 = NAN, bid3 = NAN, bid4 = NAN;
-    doublereal diu1 = NAN, diu2 = NAN, div1 = NAN, div2 = NAN, sou1 = NAN, sou2 = NAN, sov1 = NAN, sov2 = NAN;
+    integer ncfhu, ncfhv, nuroo, nvroo, nd, ii, jj, kk, ll, ibb, kkm, 
+	    llm, kkp, llp;
+    doublereal bid1, bid2, bid3, bid4;
+    doublereal diu1, diu2, div1, div2, sou1, sou2, sov1, sov2;
 
 /* ********************************************************************** 
 */
@@ -2667,17 +2665,17 @@ int mma2cd2_(integer *ndimen,
 {
   integer c__1 = 1;
   /* System generated locals */
-  integer sotbv1_dim1 = 0, sotbv1_dim2 = 0, sotbv1_offset = 0, sotbv2_dim1 = 0, sotbv2_dim2 = 0,
-  sotbv2_offset = 0, ditbv1_dim1 = 0, ditbv1_dim2 = 0, ditbv1_offset = 0, 
-  ditbv2_dim1 = 0, ditbv2_dim2 = 0, ditbv2_offset = 0, fpntab_dim1 = 0, 
-  fpntab_offset = 0, vhermt_dim1 = 0, vhermt_offset = 0, sosotb_dim1 = 0, 
-  sosotb_dim2 = 0, sosotb_offset = 0, diditb_dim1 = 0, diditb_dim2 = 0, 
-  diditb_offset = 0, soditb_dim1 = 0, soditb_dim2 = 0, soditb_offset = 0, 
-  disotb_dim1 = 0, disotb_dim2 = 0, disotb_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0, i__4 = 0;
+  integer sotbv1_dim1, sotbv1_dim2, sotbv1_offset, sotbv2_dim1, sotbv2_dim2,
+  sotbv2_offset, ditbv1_dim1, ditbv1_dim2, ditbv1_offset, 
+  ditbv2_dim1, ditbv2_dim2, ditbv2_offset, fpntab_dim1, 
+  fpntab_offset, vhermt_dim1, vhermt_offset, sosotb_dim1, 
+  sosotb_dim2, sosotb_offset, diditb_dim1, diditb_dim2, 
+  diditb_offset, soditb_dim1, soditb_dim2, soditb_offset, 
+  disotb_dim1, disotb_dim2, disotb_offset, i__1, i__2, i__3, i__4;
 
   /* Local variables */
-  integer ncfhv = 0, nuroo = 0, nvroo = 0, ii = 0, nd = 0, jj = 0, kk = 0, ibb = 0, jjm = 0, jjp = 0;
-  doublereal bid1 = NAN, bid2 = NAN, bid3 = NAN, bid4 = NAN;
+  integer ncfhv, nuroo, nvroo, ii, nd, jj, kk, ibb, jjm, jjp;
+  doublereal bid1, bid2, bid3, bid4;
 
 /* ********************************************************************** 
 */
@@ -2980,17 +2978,17 @@ int mma2cd3_(integer *ndimen,
   integer c__1 = 1;
 
    /* System generated locals */
-    integer sotbu1_dim1 = 0, sotbu1_dim2 = 0, sotbu1_offset = 0, sotbu2_dim1 = 0, sotbu2_dim2 = 0,
-	     sotbu2_offset = 0, ditbu1_dim1 = 0, ditbu1_dim2 = 0, ditbu1_offset = 0, 
-	    ditbu2_dim1 = 0, ditbu2_dim2 = 0, ditbu2_offset = 0, fpntab_dim1 = 0, 
-	    fpntab_offset = 0, uhermt_dim1 = 0, uhermt_offset = 0, sosotb_dim1 = 0, 
-	    sosotb_dim2 = 0, sosotb_offset = 0, diditb_dim1 = 0, diditb_dim2 = 0, 
-	    diditb_offset = 0, soditb_dim1 = 0, soditb_dim2 = 0, soditb_offset = 0, 
-	    disotb_dim1 = 0, disotb_dim2 = 0, disotb_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0, i__4 = 0;
+    integer sotbu1_dim1, sotbu1_dim2, sotbu1_offset, sotbu2_dim1, sotbu2_dim2,
+	     sotbu2_offset, ditbu1_dim1, ditbu1_dim2, ditbu1_offset, 
+	    ditbu2_dim1, ditbu2_dim2, ditbu2_offset, fpntab_dim1, 
+	    fpntab_offset, uhermt_dim1, uhermt_offset, sosotb_dim1, 
+	    sosotb_dim2, sosotb_offset, diditb_dim1, diditb_dim2, 
+	    diditb_offset, soditb_dim1, soditb_dim2, soditb_offset, 
+	    disotb_dim1, disotb_dim2, disotb_offset, i__1, i__2, i__3, i__4;
 
     /* Local variables */
-    integer ncfhu = 0, nuroo = 0, nvroo = 0, ii = 0, nd = 0, jj = 0, kk = 0, ibb = 0, kkm = 0, kkp = 0;
-    doublereal bid1 = NAN, bid2 = NAN, bid3 = NAN, bid4 = NAN;
+    integer ncfhu, nuroo, nvroo, ii, nd, jj, kk, ibb, kkm, kkp;
+    doublereal bid1, bid2, bid3, bid4;
 
 /* ********************************************************************** 
 */
@@ -3306,22 +3304,22 @@ int AdvApp2Var_ApproxF2var::mma2cdi_( integer *ndimen,
   integer c__8 = 8;
 
     /* System generated locals */
-    integer contr1_dim1 = 0, contr1_dim2 = 0, contr1_offset = 0, contr2_dim1 = 0, contr2_dim2 = 0,
-	     contr2_offset = 0, contr3_dim1 = 0, contr3_dim2 = 0, contr3_offset = 0, 
-	    contr4_dim1 = 0, contr4_dim2 = 0, contr4_offset = 0, sosotb_dim1 = 0, sosotb_dim2 = 0,
-	     sosotb_offset = 0, diditb_dim1 = 0, diditb_dim2 = 0, diditb_offset = 0, 
-	    soditb_dim1 = 0, soditb_dim2 = 0, soditb_offset = 0, disotb_dim1 = 0, disotb_dim2 = 0,
-	     disotb_offset = 0;
+    integer contr1_dim1, contr1_dim2, contr1_offset, contr2_dim1, contr2_dim2,
+	     contr2_offset, contr3_dim1, contr3_dim2, contr3_offset, 
+	    contr4_dim1, contr4_dim2, contr4_offset, sosotb_dim1, sosotb_dim2,
+	     sosotb_offset, diditb_dim1, diditb_dim2, diditb_offset, 
+	    soditb_dim1, soditb_dim2, soditb_offset, disotb_dim1, disotb_dim2,
+	     disotb_offset;
 
     /* Local variables */
-    integer ilong = 0;
-    intptr_t iofwr = 0;
+    integer ilong;
+    intptr_t iofwr;
     doublereal* wrkar = 0;
-    doublereal* wrkar_off = nullptr;
-    integer iszwr = 0;
-    integer ibb = 0, ier = 0;
-    integer isz1 = 0, isz2 = 0, isz3 = 0, isz4 = 0;
-    intptr_t ipt1 = 0, ipt2 = 0, ipt3 = 0;
+    doublereal* wrkar_off;
+    integer iszwr;
+    integer ibb, ier = 0;
+    integer isz1, isz2, isz3, isz4;
+    intptr_t ipt1, ipt2, ipt3;
 
 
 
@@ -3623,20 +3621,20 @@ int AdvApp2Var_ApproxF2var::mma2ce1_(integer *numdec,
   integer c__8 = 8;
   
     /* System generated locals */
-    integer sosotb_dim1 = 0, sosotb_dim2 = 0, sosotb_offset = 0, disotb_dim1 = 0, disotb_dim2 = 0,
-	     disotb_offset = 0, soditb_dim1 = 0, soditb_dim2 = 0, soditb_offset = 0, 
-	    diditb_dim1 = 0, diditb_dim2 = 0, diditb_offset = 0, patjac_dim1 = 0, patjac_dim2 = 0,
-	     patjac_offset = 0;
+    integer sosotb_dim1, sosotb_dim2, sosotb_offset, disotb_dim1, disotb_dim2,
+	     disotb_offset, soditb_dim1, soditb_dim2, soditb_offset, 
+	    diditb_dim1, diditb_dim2, diditb_offset, patjac_dim1, patjac_dim2,
+	     patjac_offset;
 
     /* Local variables */
-    logical ldbg = 0;
-    intptr_t iofwr = 0;
+    logical ldbg;
+    intptr_t iofwr;
     doublereal* wrkar = 0;
-    doublereal* wrkar_off = nullptr;
-    integer iszwr = 0;
-    integer ier = 0;
-    integer isz1 = 0, isz2 = 0, isz3 = 0, isz4 = 0, isz5 = 0, isz6 = 0, isz7 = 0;
-    intptr_t ipt1 = 0, ipt2 = 0, ipt3 = 0, ipt4 = 0, ipt5 = 0, ipt6 = 0;
+    doublereal* wrkar_off;
+    integer iszwr;
+    integer ier;
+    integer isz1, isz2, isz3, isz4, isz5, isz6, isz7;
+    intptr_t ipt1, ipt2, ipt3, ipt4, ipt5, ipt6;
 
 
 
@@ -3904,20 +3902,20 @@ int mma2ce2_(integer *numdec,
 
 {
   /* System generated locals */
-  integer sosotb_dim1 = 0, sosotb_dim2 = 0, sosotb_offset = 0, disotb_dim1 = 0, disotb_dim2 = 0,
-  disotb_offset = 0, soditb_dim1 = 0, soditb_dim2 = 0, soditb_offset = 0, 
-  diditb_dim1 = 0, diditb_dim2 = 0, diditb_offset = 0, gssutb_dim1 = 0, gssvtb_dim1 = 0,
-  chpair_dim1 = 0, chpair_dim2 = 0, chpair_offset = 0, chimpr_dim1 = 0, 
-  chimpr_dim2 = 0, chimpr_offset = 0, patjac_dim1 = 0, patjac_dim2 = 0, 
-  patjac_offset = 0, vecerr_dim1 = 0, vecerr_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0, i__4 = 0;
+  integer sosotb_dim1, sosotb_dim2, sosotb_offset, disotb_dim1, disotb_dim2,
+  disotb_offset, soditb_dim1, soditb_dim2, soditb_offset, 
+  diditb_dim1, diditb_dim2, diditb_offset, gssutb_dim1, gssvtb_dim1,
+  chpair_dim1, chpair_dim2, chpair_offset, chimpr_dim1, 
+  chimpr_dim2, chimpr_offset, patjac_dim1, patjac_dim2, 
+  patjac_offset, vecerr_dim1, vecerr_offset, i__1, i__2, i__3, i__4;
   
   /* Local variables */
-  logical ldbg = 0;
-  integer idim = 0, igsu = 0, minu = 0, minv = 0, maxu = 0, maxv = 0, igsv = 0;
+  logical ldbg;
+  integer idim, igsu, minu, minv, maxu, maxv, igsv;
   doublereal vaux[3];
-  integer i2rdu = 0, i2rdv = 0, ndses = 0, nd = 0, ii = 0, jj = 0, kk = 0, nu = 0, nv = 0;
-  doublereal zu = NAN, zv = NAN;
-  integer nu1 = 0, nv1 = 0;
+  integer i2rdu, i2rdv, ndses, nd, ii, jj, kk, nu, nv;
+  doublereal zu, zv;
+  integer nu1, nv1;
 
 /* ********************************************************************** 
 */
@@ -4673,13 +4671,13 @@ int mma2cfu_(integer *ndujac,
 
 {
   /* System generated locals */
-  integer sosotb_dim1 = 0, disotb_dim1 = 0, disotb_offset = 0, soditb_dim1 = 0, 
-  soditb_offset = 0, diditb_dim1 = 0, i__1 = 0, i__2 = 0;
+  integer sosotb_dim1, disotb_dim1, disotb_offset, soditb_dim1, 
+  soditb_offset, diditb_dim1, i__1, i__2;
 
   /* Local variables */
-  logical ldbg = 0;
-  integer nptu2 = 0, nptv2 = 0, ii = 0, jj = 0;
-  doublereal bid0 = NAN, bid1 = NAN, bid2 = NAN;
+  logical ldbg;
+  integer nptu2, nptv2, ii, jj;
+  doublereal bid0, bid1, bid2;
 
 /* ********************************************************************** 
 */
@@ -4889,13 +4887,13 @@ int mma2cfv_(integer *ndvjac,
 
 {
   /* System generated locals */
-  integer chpair_dim1 = 0, chpair_offset = 0, chimpr_dim1 = 0, chimpr_offset = 0, 
-  patjac_offset = 0, i__1 = 0, i__2 = 0;
+  integer chpair_dim1, chpair_offset, chimpr_dim1, chimpr_offset, 
+  patjac_offset, i__1, i__2;
 
   /* Local variables */
-  logical ldbg = 0;
-  integer nptv2 = 0, ii = 0, jj = 0;
-  doublereal bid1 = NAN;
+  logical ldbg;
+  integer nptv2, ii, jj;
+  doublereal bid1;
 
 /* ********************************************************************** 
 */
@@ -5045,15 +5043,15 @@ int AdvApp2Var_ApproxF2var::mma2ds1_(integer *ndimen,
 
 {
   /* System generated locals */
-  integer sosotb_dim1 = 0, sosotb_dim2 = 0, sosotb_offset = 0, disotb_dim1 = 0, disotb_dim2 = 0,
-  disotb_offset = 0, soditb_dim1 = 0, soditb_dim2 = 0, soditb_offset = 0, 
-  diditb_dim1 = 0, diditb_dim2 = 0, diditb_offset = 0, fpntab_dim1 = 0, 
-  fpntab_offset = 0, i__1 = 0;
+  integer sosotb_dim1, sosotb_dim2, sosotb_offset, disotb_dim1, disotb_dim2,
+  disotb_offset, soditb_dim1, soditb_dim2, soditb_offset, 
+  diditb_dim1, diditb_dim2, diditb_offset, fpntab_dim1, 
+  fpntab_offset, i__1;
 
   /* Local variables */
-  logical ldbg = 0;
-  integer ibid1 = 0, ibid2 = 0, iuouv = 0, nd = 0;
-  integer isz1 = 0, isz2 = 0;
+  logical ldbg;
+  integer ibid1, ibid2, iuouv, nd;
+  integer isz1, isz2;
 
 /* ********************************************************************** 
 */
@@ -5366,18 +5364,18 @@ int mma2ds2_(integer *ndimen,
 {
   integer c__0 = 0;
   /* System generated locals */
-  integer sosotb_dim1 = 0, sosotb_dim2 = 0, sosotb_offset = 0, disotb_dim1 = 0, disotb_dim2 = 0,
-  disotb_offset = 0, soditb_dim1 = 0, soditb_dim2 = 0, soditb_offset = 0, 
-  diditb_dim1 = 0, diditb_dim2 = 0, diditb_offset = 0, fpntab_dim1 = 0, 
-  fpntab_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0;
+  integer sosotb_dim1, sosotb_dim2, sosotb_offset, disotb_dim1, disotb_dim2,
+  disotb_offset, soditb_dim1, soditb_dim2, soditb_offset, 
+  diditb_dim1, diditb_dim2, diditb_offset, fpntab_dim1, 
+  fpntab_offset, i__1, i__2, i__3;
 
   /* Local variables */
-  integer jdec = 0;
-  logical ldbg = 0;
-  doublereal alinu = NAN, blinu = NAN, alinv = NAN, blinv = NAN, tcons = NAN;
+  integer jdec;
+  logical ldbg;
+  doublereal alinu, blinu, alinv, blinv, tcons;
   doublereal dbfn1[2], dbfn2[2];
-  integer nuroo = 0, nvroo = 0, id = 0, iu = 0, iv = 0;
-  doublereal um = NAN, up = NAN;
+  integer nuroo, nvroo, id, iu, iv;
+  doublereal um, up;
 
 
 /* ********************************************************************** 
@@ -5744,15 +5742,15 @@ int mma2er1_(integer *ndjacu,
 
 {
   /* System generated locals */
-  integer patjac_dim1 = 0, patjac_dim2 = 0, patjac_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0;
-  doublereal d__1 = NAN;
+  integer patjac_dim1, patjac_dim2, patjac_offset, i__1, i__2, i__3;
+  doublereal d__1;
 
   /* Local variables */
-  logical ldbg = 0;
-  integer minu = 0, minv = 0;
+  logical ldbg;
+  integer minu, minv;
   doublereal vaux[2];
-  integer ii = 0, nd = 0, jj = 0;
-  doublereal bid0 = NAN, bid1 = NAN;
+  integer ii, nd, jj;
+  doublereal bid0, bid1;
 
 /* ********************************************************************** 
 */
@@ -5910,16 +5908,16 @@ int mma2er2_(integer *ndjacu,
 
 {
   /* System generated locals */
-  integer patjac_dim1 = 0, patjac_dim2 = 0, patjac_offset = 0, i__1 = 0, i__2 = 0;
-  doublereal d__1 = NAN;
+  integer patjac_dim1, patjac_dim2, patjac_offset, i__1, i__2;
+  doublereal d__1;
 
   /* Local variables */
-  logical ldbg = 0;
+  logical ldbg;
   doublereal vaux[2];
-  integer i2rdu = 0, i2rdv = 0;
-  doublereal errnu = NAN, errnv = NAN;
-  integer ii = 0, nd = 0, jj = 0, nu = 0, nv = 0;
-  doublereal bid0 = NAN, bid1 = NAN;
+  integer i2rdu, i2rdv;
+  doublereal errnu, errnv;
+  integer ii, nd, jj, nu, nv;
+  doublereal bid0, bid1;
 
 /* ********************************************************************** 
 */
@@ -6157,31 +6155,31 @@ int AdvApp2Var_ApproxF2var::mma2fnc_(integer *ndimen,
   integer c__8 = 8;
 
    /* System generated locals */
-    integer courbe_dim1 = 0, courbe_dim2 = 0, courbe_offset = 0, somtab_dim1 = 0, somtab_dim2 = 0,
-	     somtab_offset = 0, diftab_dim1 = 0, diftab_dim2 = 0, diftab_offset = 0, 
-	    contr1_dim1 = 0, contr1_dim2 = 0, contr1_offset = 0, contr2_dim1 = 0, contr2_dim2 = 0,
-	     contr2_offset = 0, errmax_dim1 = 0, errmax_offset = 0, errmoy_dim1 = 0, 
-	    errmoy_offset = 0, i__1 = 0;
-    doublereal d__1 = NAN;
+    integer courbe_dim1, courbe_dim2, courbe_offset, somtab_dim1, somtab_dim2,
+	     somtab_offset, diftab_dim1, diftab_dim2, diftab_offset, 
+	    contr1_dim1, contr1_dim2, contr1_offset, contr2_dim1, contr2_dim2,
+	     contr2_offset, errmax_dim1, errmax_offset, errmoy_dim1, 
+	    errmoy_offset, i__1;
+    doublereal d__1;
 
     /* Local variables */
-    integer ideb = 0;
-    doublereal tmil = NAN;
-    integer  ideb1 = 0, ibid1 = 0, ibid2 = 0, ncfja = 0, ndgre = 0, ilong = 0, 
-	    ndwrk = 0;
+    integer ideb;
+    doublereal tmil;
+    integer  ideb1, ibid1, ibid2, ncfja, ndgre, ilong, 
+	    ndwrk;
     doublereal* wrkar = 0;
-    doublereal* wrkar_off = nullptr;
-    integer nupil = 0;
-    intptr_t iofwr = 0;
+    doublereal* wrkar_off;
+    integer nupil;
+    intptr_t iofwr;
     doublereal uvpav[4]	/* was [2][2] */;
-    integer nd = 0, ii = 0;
-    integer ibb = 0;
+    integer nd, ii;
+    integer ibb;
     integer ier = 0;
     doublereal uv11[4]	/* was [2][2] */;
-  integer ncb1 = 0;
-    doublereal eps3 = NAN;
-    integer isz1 = 0, isz2 = 0, isz3 = 0, isz4 = 0, isz5 = 0;
-    intptr_t ipt1 = 0, ipt2 = 0, ipt3 = 0, ipt4 = 0,iptt = 0, jptt = 0;
+  integer ncb1;
+    doublereal eps3;
+    integer isz1, isz2, isz3, isz4, isz5;
+    intptr_t ipt1, ipt2, ipt3, ipt4,iptt, jptt;
 
 /* ********************************************************************** 
 */
@@ -6709,16 +6707,16 @@ int AdvApp2Var_ApproxF2var::mma2fx6_(integer *ncfmxu,
 
 {
   /* System generated locals */
-  integer epsfro_dim1 = 0, epsfro_offset = 0, patcan_dim1 = 0, patcan_dim2 = 0, patcan_dim3 = 0,
-  patcan_dim4 = 0, patcan_offset = 0, errmax_dim1 = 0, errmax_dim2 = 0, 
-  errmax_offset = 0, ncoefu_dim1 = 0, ncoefu_offset = 0, ncoefv_dim1 = 0, 
-  ncoefv_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0, i__4 = 0, i__5 = 0;
-  doublereal d__1 = NAN, d__2 = NAN;
+  integer epsfro_dim1, epsfro_offset, patcan_dim1, patcan_dim2, patcan_dim3,
+  patcan_dim4, patcan_offset, errmax_dim1, errmax_dim2, 
+  errmax_offset, ncoefu_dim1, ncoefu_offset, ncoefv_dim1, 
+  ncoefv_offset, i__1, i__2, i__3, i__4, i__5;
+  doublereal d__1, d__2;
 
   /* Local variables */
-  integer idim = 0, ncfu = 0, ncfv = 0, id = 0, ii = 0, nd = 0, jj = 0, ku = 0, kv = 0, ns = 0, ibb = 0;
-  doublereal bid = NAN;
-  doublereal tol = NAN;
+  integer idim, ncfu, ncfv, id, ii, nd, jj, ku, kv, ns, ibb;
+  doublereal bid;
+  doublereal tol;
 
 /* ********************************************************************** 
 */
@@ -7144,12 +7142,12 @@ int AdvApp2Var_ApproxF2var::mma2jmx_(integer *ndgjac,
 	    2.71238965987606292679677228666411 };
 
     /* System generated locals */
-    integer i__1 = 0;
+    integer i__1;
 
     /* Local variables */
-    logical ldbg = 0;
-    integer numax = 0, ii = 0;
-    doublereal bid = NAN;
+    logical ldbg;
+    integer numax, ii;
+    doublereal bid;
 
 
 /* ********************************************************************** 
@@ -7248,12 +7246,12 @@ int mma2moy_(integer *ndgumx,
 	     doublereal *errmoy)
 {
   /* System generated locals */
-    integer patjac_dim1 = 0, patjac_dim2 = 0, patjac_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0;
+    integer patjac_dim1, patjac_dim2, patjac_offset, i__1, i__2, i__3;
    
     /* Local variables */
-    logical ldbg = 0;
-    integer minu = 0, minv = 0, idebu = 0, idebv = 0, ii = 0, nd = 0, jj = 0;
-    doublereal bid0 = NAN, bid1 = NAN;
+    logical ldbg;
+    integer minu, minv, idebu, idebv, ii, nd, jj;
+    doublereal bid0, bid1;
     
     
 /* ********************************************************************** 
@@ -7395,10 +7393,10 @@ int AdvApp2Var_ApproxF2var::mma2roo_(integer *nbpntu,
 				     doublereal *vrootl)
 {
   /* System generated locals */
-  integer i__1 = 0;
+  integer i__1;
 
   /* Local variables */
-  integer ii = 0, ibb = 0;
+  integer ii, ibb;
 
 /* ********************************************************************** 
 */
@@ -7500,13 +7498,13 @@ int mmmapcoe_(integer *ndim,
 
 {
   /* System generated locals */
-  integer somtab_dim1 = 0, somtab_offset = 0, diftab_dim1 = 0, diftab_offset = 0, 
-  crvjac_dim1 = 0, crvjac_offset = 0, gsstab_dim1 = 0, i__1 = 0, i__2 = 0, i__3 = 0;
+  integer somtab_dim1, somtab_offset, diftab_dim1, diftab_offset, 
+  crvjac_dim1, crvjac_offset, gsstab_dim1, i__1, i__2, i__3;
 
   /* Local variables */
-  integer igss = 0, ikdeb = 0;
-  doublereal bidon = NAN;
-  integer nd = 0, ik = 0, ir = 0, nbroot = 0, ibb = 0;
+  integer igss, ikdeb;
+  doublereal bidon;
+  integer nd, ik, ir, nbroot, ibb;
 
 /* ********************************************************************** 
 */
@@ -7662,12 +7660,12 @@ int mmaperm_(integer *ncofmx,
 	     doublereal *errmoy)
 {
   /* System generated locals */
-  integer crvjac_dim1 = 0, crvjac_offset = 0, i__1 = 0, i__2 = 0;
+  integer crvjac_dim1, crvjac_offset, i__1, i__2;
 
   /* Local variables */
-  doublereal bidj = NAN;
-  integer i__ = 0, ia = 0, nd = 0, ncfcut = 0, ibb = 0;
-  doublereal bid = NAN;
+  doublereal bidj;
+  integer i__, ia, nd, ncfcut, ibb;
+  doublereal bid;
 
 /* ********************************************************************** 
 */
@@ -7771,10 +7769,10 @@ int AdvApp2Var_ApproxF2var::mmapptt_(const integer *ndgjac,
 				     integer *iercod)
 {
   /* System generated locals */
-  integer cgauss_dim1 = 0, i__1 = 0;
+  integer cgauss_dim1, i__1;
 
   /* Local variables */
-  integer kjac = 0, iptt = 0, ipdb0 = 0, infdg = 0, iptdb = 0, mxjac = 0, ilong = 0, ibb = 0;
+  integer kjac, iptt, ipdb0, infdg, iptdb, mxjac, ilong, ibb;
 
 /* ********************************************************************** 
 */
@@ -8073,12 +8071,12 @@ int mmjacpt_(const integer *ndimen,
 	     doublereal *ptccan)
 {
     /* System generated locals */
-  integer ptccan_dim1 = 0, ptccan_dim2 = 0, ptccan_offset = 0, ptclgd_dim1 = 0, ptclgd_dim2 = 0,
-  ptclgd_offset = 0, ptcaux_dim1 = 0, ptcaux_dim2 = 0, ptcaux_dim3 = 0, 
-  ptcaux_offset = 0, i__1 = 0, i__2 = 0, i__3 = 0;
+  integer ptccan_dim1, ptccan_dim2, ptccan_offset, ptclgd_dim1, ptclgd_dim2,
+  ptclgd_offset, ptcaux_dim1, ptcaux_dim2, ptcaux_dim3, 
+  ptcaux_offset, i__1, i__2, i__3;
   
   /* Local variables */
-  integer kdim = 0, nd = 0, ii = 0, jj = 0, ibb = 0;
+  integer kdim, nd, ii, jj, ibb;
 
 /* ***********************************************************************
  */

src/AdvApp2Var/AdvApp2Var_Context.cxx

@@ -15,8 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <math.h>
-
 #include <AdvApp2Var_ApproxF2var.hxx>
 #include <AdvApp2Var_Context.hxx>
 #include <Standard_ConstructionError.hxx>
@@ -110,7 +108,7 @@ myNb2DSS(nb2Dss),
 myNb3DSS(nb3Dss)
 {
 Standard_Integer ErrorCode=0,NbPntU=0,JDegU=0,NbPntV=0,JDegV=0;
-Standard_Integer ncfl = 0;
+Standard_Integer ncfl;
 
 // myNbURoot,myJDegU
 ncfl = nlimu;
@@ -122,7 +120,7 @@ myJDegU = JDegU;
 if (iu>-1) NbPntU = myNbURoot - 2;
 
 // myJMaxU
-Standard_Integer i = 0,j = 0,size = JDegU-2*iu-1;
+Standard_Integer i,j,size = JDegU-2*iu-1;
 Handle (TColStd_HArray1OfReal) JMaxU =
   new TColStd_HArray1OfReal(1,size);
 Standard_Real *JU_array =
@@ -225,7 +223,7 @@ for (j=1;j<=4;j++) {
 }
 }
 if (iu>-1||iv>-1) {
-  Standard_Real tolmin = NAN, poids = NAN, hmax[4];
+  Standard_Real tolmin, poids, hmax[4];
   hmax[0] = 0;
   hmax[1] = 1;
   hmax[2] = 1.5;

src/AdvApp2Var/AdvApp2Var_Framework.cxx

@@ -45,11 +45,11 @@ AdvApp2Var_Framework::AdvApp2Var_Framework()
 
 AdvApp2Var_Framework::AdvApp2Var_Framework(const AdvApp2Var_SequenceOfNode& Frame,
 					   const AdvApp2Var_SequenceOfStrip& UFrontier,
-					   const AdvApp2Var_SequenceOfStrip& VFrontier) : myNodeConstraints(Frame), myUConstraints(UFrontier), myVConstraints(VFrontier)
+					   const AdvApp2Var_SequenceOfStrip& VFrontier)
 {
-  
-  
-  
+  myNodeConstraints = Frame;
+  myUConstraints = UFrontier;
+  myVConstraints = VFrontier;
 }
 
 //==========================================================================================
@@ -92,7 +92,7 @@ Standard_Integer AdvApp2Var_Framework::FirstNode(const GeomAbs_IsoType Type,
 						 const Standard_Integer IndexIso,
 						 const Standard_Integer IndexStrip) const 
 {
-  Standard_Integer NbIso = 0,Index = 0;
+  Standard_Integer NbIso,Index;
   NbIso = myUConstraints.Length()+1;
   if (Type==GeomAbs_IsoU) {
     Index = NbIso * (IndexStrip-1) + IndexIso;
@@ -113,7 +113,7 @@ Standard_Integer AdvApp2Var_Framework::LastNode(const GeomAbs_IsoType Type,
 					       const Standard_Integer IndexIso,
 					       const Standard_Integer IndexStrip) const 
 {
-  Standard_Integer NbIso = 0,Index = 0;
+  Standard_Integer NbIso,Index;
   NbIso = myUConstraints.Length()+1;
   if (Type==GeomAbs_IsoU) {
     Index = NbIso * IndexStrip + IndexIso;

src/AdvApp2Var/AdvApp2Var_Iso.cxx

@@ -116,9 +116,9 @@ void AdvApp2Var_Iso::MakeApprox(const AdvApp2Var_Context& Conditions,
 				AdvApp2Var_Node& NodeEnd)
 {
 // fixed values
-  Standard_Integer NBCRMX=1, NBCRBE = 0;
+  Standard_Integer NBCRMX=1, NBCRBE;
 // data stored in the Context
-  Standard_Integer NDIMEN = 0, NBSESP = 0, NDIMSE = 0;
+  Standard_Integer NDIMEN, NBSESP, NDIMSE;
   NDIMEN = Conditions.TotalDimension();
   NBSESP = Conditions.TotalNumberSSP();
 // Attention : works only in 3D
@@ -176,7 +176,7 @@ void AdvApp2Var_Iso::MakeApprox(const AdvApp2Var_Context& Conditions,
 
 // data relative to the position of iso (front or cut line)
   Handle (TColStd_HArray1OfReal) HEPSAPR = new TColStd_HArray1OfReal(1,NBSESP);
-  Standard_Integer iesp = 0;
+  Standard_Integer iesp;
   switch(myPosition) {
    case 0 :
     for (iesp=1;iesp<=NBSESP;iesp++) {
@@ -247,7 +247,7 @@ void AdvApp2Var_Iso::MakeApprox(const AdvApp2Var_Context& Conditions,
 // the approximations
 //
   Standard_Integer IERCOD=0, NCOEFF=0;
-  Standard_Integer iapp = 0,ncfapp = 0,ierapp = 0;
+  Standard_Integer iapp,ncfapp,ierapp;
 //  Standard_Integer id,ic,ideb;
   for (iapp=0;iapp<=IDERIV;iapp++) {
 //   approximation of the derivative of order iapp
@@ -291,7 +291,7 @@ void AdvApp2Var_Iso::MakeApprox(const AdvApp2Var_Context& Conditions,
     if (NCOEFF<=ncfapp) NCOEFF=ncfapp;
     if (ierapp==-1) IERCOD = -1;
 //   return constraints of order 0 to IORDRE of extremities
-    Standard_Integer ider = 0, jpos=HCONTR1->Lower();
+    Standard_Integer ider, jpos=HCONTR1->Lower();
     for (ider=0; ider<=IORDRE;ider++) {
       gp_Pnt pt(HCONTR1->Value(jpos),
 		HCONTR1->Value(jpos+1),

src/AdvApp2Var/AdvApp2Var_Network.cxx

@@ -39,11 +39,11 @@ AdvApp2Var_Network::AdvApp2Var_Network()
 
 AdvApp2Var_Network::AdvApp2Var_Network(const AdvApp2Var_SequenceOfPatch& Net,
 				       const TColStd_SequenceOfReal& TheU,
-				       const TColStd_SequenceOfReal& TheV) : myNet(Net), myUParameters(TheU), myVParameters(TheV)
+				       const TColStd_SequenceOfReal& TheV)
 {
-  
-  
-  
+  myNet=Net;
+  myUParameters=TheU;
+  myVParameters=TheV;
 }
 
 //==========================================================================================
@@ -75,7 +75,7 @@ void AdvApp2Var_Network::UpdateInU(const Standard_Real CuttingValue)
 {
 
 //  insertion du nouveau parametre de decoupe
-  Standard_Integer i=1,j = 0;
+  Standard_Integer i=1,j;
   while (myUParameters.Value(i)<CuttingValue) {
     i++;
   }

src/AdvApp2Var/AdvApp2Var_Patch.cxx

@@ -22,8 +22,6 @@
 //   by:	Joelle CHAUVET / Jean-Marc LACHAUME
 //		Initialisation de myCritValue pour OSF
 
-#include <math.h>
-
 #include <AdvApp2Var_ApproxF2var.hxx>
 #include <AdvApp2Var_Context.hxx>
 #include <AdvApp2Var_Criterion.hxx>
@@ -111,21 +109,21 @@ void AdvApp2Var_Patch::Discretise(const AdvApp2Var_Context& Conditions,
 {
 
 // data stored in the Context
-  Standard_Integer NDIMEN = 0, ISOFAV = 0;
+  Standard_Integer NDIMEN, ISOFAV;
   NDIMEN = Conditions.TotalDimension();
 // Attention : works only for 3D
   ISOFAV = Conditions.FavorIso();
 
 // data related to the patch to be discretized
-  Standard_Integer NBPNTU = 0, NBPNTV = 0;
+  Standard_Integer NBPNTU, NBPNTV;
   Standard_Integer IORDRU = myOrdInU, IORDRV = myOrdInV;
   Handle (TColStd_HArray1OfReal) HUROOT  = Conditions.URoots();
   Handle (TColStd_HArray1OfReal) HVROOT  = Conditions.VRoots();
-  Standard_Real * UROOT = nullptr;
+  Standard_Real * UROOT;
     UROOT =  (Standard_Real *) &HUROOT ->ChangeArray1()(HUROOT ->Lower());
   NBPNTU = (Conditions.URoots())->Length();
   if (myOrdInU>-1) NBPNTU -= 2;
-  Standard_Real * VROOT = nullptr;
+  Standard_Real * VROOT;
     VROOT =  (Standard_Real *) &HVROOT ->ChangeArray1()(HVROOT ->Lower());
   NBPNTV = (Conditions.VRoots())->Length();
   if (myOrdInV>-1) NBPNTV -= 2;
@@ -137,8 +135,8 @@ void AdvApp2Var_Patch::Discretise(const AdvApp2Var_Context& Conditions,
     new TColStd_HArray1OfReal(1,SIZE*4);
   HCOINS->Init(0.);
 
-  Standard_Integer iu = 0,iv = 0;
-  Standard_Real du=(myU1-myU0)/2,dv=(myV1-myV0)/2,rho = NAN,valnorm = NAN;
+  Standard_Integer iu,iv;
+  Standard_Real du=(myU1-myU0)/2,dv=(myV1-myV0)/2,rho,valnorm;
 
   for (iu=0;iu<=myOrdInU;iu++) {
     for (iv=0;iv<=myOrdInV;iv++) {
@@ -211,7 +209,7 @@ void AdvApp2Var_Patch::Discretise(const AdvApp2Var_Context& Conditions,
     ( (Constraints.IsoU(myU1,myV0,myV1)).DifTab() ) ->Array1();
 
 // normalization
-  Standard_Integer ideb1 = 0,ideb2 = 0,ideb3 = 0,ideb4 = 0,jj = 0;
+  Standard_Integer ideb1,ideb2,ideb3,ideb4,jj;
   for (iu=1;iu<=IORDRU;iu++) {
     rho = pow(du,iu);
     ideb1 = HSU0->Lower() + iu*SIZE -1;
@@ -404,8 +402,8 @@ void AdvApp2Var_Patch::AddConstraints(const AdvApp2Var_Context& Conditions,
 				      const AdvApp2Var_Framework& Constraints)
 {
 // data stored in the  Context
-  Standard_Integer NDIMEN = 0;
-  Standard_Integer IERCOD = 0, NCFLMU = 0, NCFLMV = 0, NDegU = 0, NDegV = 0;
+  Standard_Integer NDIMEN;
+  Standard_Integer IERCOD, NCFLMU, NCFLMV, NDegU, NDegV;
   NDIMEN = Conditions.TotalDimension();
 // Attention : works only for 3D
   NCFLMU = Conditions.ULimit();
@@ -445,9 +443,9 @@ void AdvApp2Var_Patch::AddConstraints(const AdvApp2Var_Context& Conditions,
   HCFU1->Init( (Constraints.IsoU(myU1,myV0,myV1)).NbCoeff() );
 
 // normalization of Isos U
-  Standard_Integer iu = 0,iv = 0;
-  Standard_Real du=(myU1-myU0)/2,dv=(myV1-myV0)/2,rho = NAN,valnorm = NAN;
-  Standard_Integer ideb0 = 0,ideb1 = 0,jj = 0;
+  Standard_Integer iu,iv;
+  Standard_Real du=(myU1-myU0)/2,dv=(myV1-myV0)/2,rho,valnorm;
+  Standard_Integer ideb0,ideb1,jj;
 
   for (iu=1;iu<=IORDRU;iu++) {
     rho = pow(du,iu);
@@ -534,7 +532,7 @@ void AdvApp2Var_Patch::AddConstraints(const AdvApp2Var_Context& Conditions,
   }
 
 // add constraints at the corners
-  Standard_Integer ideb = 0;
+  Standard_Integer ideb;
   SIZE=NDIMEN*(IORDRU+2)*(IORDRV+2);
   Handle (TColStd_HArray1OfReal) HCOINS  =
     new TColStd_HArray1OfReal(1,SIZE*4);
@@ -592,8 +590,8 @@ void AdvApp2Var_Patch::AddConstraints(const AdvApp2Var_Context& Conditions,
   Standard_Real *FACT = 
     (Standard_Real *) &HFACT ->ChangeArray1()(HFACT ->Lower());
 
-  Standard_Integer idim = 0,ncf0 = 0,ncf1 = 0,iun=1;
-  Standard_Real *Is = nullptr;
+  Standard_Integer idim,ncf0,ncf1,iun=1;
+  Standard_Real *Is;
 
 // add extremities of isos U
   for (iu=1;iu<=IORDRU+1;iu++) {
@@ -658,10 +656,10 @@ void AdvApp2Var_Patch::AddConstraints(const AdvApp2Var_Context& Conditions,
 
 void AdvApp2Var_Patch::AddErrors(const AdvApp2Var_Framework& Constraints)
 {
-  Standard_Integer NBSESP = 1, iesp = 0;
-  Standard_Integer iu = 0,iv = 0;
+  Standard_Integer NBSESP = 1, iesp;
+  Standard_Integer iu,iv;
 
-  Standard_Real errU = NAN,errV = NAN,error = NAN,hmax[4];
+  Standard_Real errU,errV,error,hmax[4];
   hmax[0] = 0;
   hmax[1] = 1;
   hmax[2] = 1.5;
@@ -720,7 +718,7 @@ void AdvApp2Var_Patch::AddErrors(const AdvApp2Var_Framework& Constraints)
 	      ((Constraints.IsoU(myU1,myV0,myV1)).MaxErrors())->Value(iesp,1));
 
 // calculate max errors at the corners
-    Standard_Real emax1=0.,emax2=0.,emax3=0.,emax4=0.,err1 = NAN,err2 = NAN,err3 = NAN,err4 = NAN;
+    Standard_Real emax1=0.,emax2=0.,emax3=0.,emax4=0.,err1,err2,err3,err4;
     for (iu=0;iu<=myOrdInU;iu++) {
       for (iv=0;iv<=myOrdInV;iv++) {
     error = (Constraints.Node(myU0,myV0))->Error(iu,iv);
@@ -768,9 +766,9 @@ void AdvApp2Var_Patch::MakeApprox(const AdvApp2Var_Context& Conditions,
 {
 
 // data stored in the Context
-  Standard_Integer NDIMEN = 0, NBSESP = 0, NDIMSE = 0;
-  Standard_Integer NBPNTU = 0, NBPNTV = 0, NCFLMU = 0, NCFLMV = 0, NDJACU = 0, NDJACV = 0;
-  Standard_Integer NDegU = 0, NDegV = 0, NJacU = 0, NJacV = 0;
+  Standard_Integer NDIMEN, NBSESP, NDIMSE;
+  Standard_Integer NBPNTU, NBPNTV, NCFLMU, NCFLMV, NDJACU, NDJACV;
+  Standard_Integer NDegU, NDegV, NJacU, NJacV;
   NDIMEN = Conditions.TotalDimension();
   NBSESP = Conditions.TotalNumberSSP();
   NDIMSE = 3;
@@ -789,7 +787,7 @@ void AdvApp2Var_Patch::MakeApprox(const AdvApp2Var_Context& Conditions,
 
 // data relative to the processed patch
   Standard_Integer IORDRU = myOrdInU, IORDRV = myOrdInV,
-                   NDMINU = 1, NDMINV = 1, NCOEFU = 0, NCOEFV = 0;
+                   NDMINU = 1, NDMINV = 1, NCOEFU, NCOEFV;
 // NDMINU and NDMINV depend on the nb of coeff of neighboring isos
 // and of the required order of continuity
   NDMINU = Max(1,2*IORDRU+1);
@@ -809,7 +807,7 @@ void AdvApp2Var_Patch::MakeApprox(const AdvApp2Var_Context& Conditions,
     new TColStd_HArray1OfReal(1,NBSESP);
   Handle (TColStd_HArray1OfReal) HEPSFRO =
     new TColStd_HArray1OfReal(1,NBSESP*8);
-  Standard_Integer iesp = 0;
+  Standard_Integer iesp;
   for (iesp=1;iesp<=NBSESP;iesp++) {
     HEPSAPR->SetValue(iesp,(Conditions.IToler())->Value(iesp));
     HEPSFRO->SetValue(iesp,(Conditions.FToler())->Value(iesp,1));
@@ -939,7 +937,7 @@ void AdvApp2Var_Patch::MakeApprox(const AdvApp2Var_Context& Conditions,
 				     &myNbCoeffInV);
     
 // transposition (NCFLMU,NCFLMV,NDIMEN)Fortran-C++
-    Standard_Integer aIU = 0, aIN = 0, dim = 0, ii = 0, jj = 0;
+    Standard_Integer aIU, aIN, dim, ii, jj;
     for (dim=1; dim<=NDIMEN; dim++){
        aIN = (dim-1)*NCFLMU*NCFLMV;
        for (ii=1; ii<=NCFLMU; ii++) {