]> SALOME platform Git repositories - modules/smesh.git/commitdiff
Salome HOME
Porting to OCCT7.5.0
authorjfa <jfa@opencascade.com>
Tue, 15 Dec 2020 10:59:42 +0000 (13:59 +0300)
committerjfa <jfa@opencascade.com>
Tue, 15 Dec 2020 10:59:42 +0000 (13:59 +0300)
src/SMESH_I/SMESH_2smeshpy.cxx
src/SMESH_I/SMESH_PythonDump.cxx

index 9603f3443fc2eef55f7745d2999ee1c813f6b537..4ab71b44977e29027da7f1d171073e8ae71b4121 100644 (file)
 #include <SALOMEDS_wrap.hxx>
 #include <utilities.h>
 
+#include <Basics_OCCTVersion.hxx>
 #include <Resource_DataMapOfAsciiStringAsciiString.hxx>
+#if OCC_VERSION_LARGE < 0x07050000
 #include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
+#endif
 
 #include "SMESH_Gen_i.hxx"
 /* SALOME headers that include CORBA headers that include windows.h
index 022f881a96f2e54ab976af4800f4641689e1baf4..3ecff618477b9bb3f43b2cc468048125bb85bbff 100644 (file)
 #include "SMESH_MeshEditor_i.hxx"
 
 #include <Basics_Utils.hxx>
+#include <Basics_OCCTVersion.hxx>
 #include <SALOMEDS_wrap.hxx>
 
 #include <LDOMParser.hxx>
-#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
 #include <TCollection_AsciiString.hxx>
 
+#if OCC_VERSION_LARGE < 0x07050000
+#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
+#endif
+
 #include <cstring>
 
 #ifdef _DEBUG_