kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

external smesh: use version info

Browse Source 
for precompiler conditionals
This commit is contained in:
looooo
2018-04-22 20:11:36 +02:00
committed by wmayer
parent c74af88e0b
commit c999ec1960
13 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/MeshPart/App/Mesher.cpp
View File

@@ -43,7 +43,7 @@
#include <SMESH_Gen.hxx>
#include <StdMeshers_MaxLength.hxx>
#ifdef EXTERNAL_SMESH
#if SMESH_VERSION_MAJOR >= 7
#include <SMESH_Mesh.hxx>
#include <SMESHDS_Mesh.hxx>
#else
@@ -75,7 +75,7 @@
using namespace MeshPart;
#ifdef EXTERNAL_SMESH
#if SMESH_VERSION_MAJOR >= 7
SMESH_Gen* Mesher::_mesh_gen = 0;
#endif
@@ -323,7 +323,7 @@ Mesh::MeshObject* Mesher::createMesh() const
#else
std::list<SMESH_Hypothesis*> hypoth;
#ifndef EXTERNAL_SMESH
#if SMESH_VERSION_MAJOR < 7
SMESH_Gen* meshgen = SMESH_Gen::get();
#else
if (! Mesher::_mesh_gen)
@@ -406,7 +406,7 @@ Mesh::MeshObject* Mesher::createMesh() const
StdMeshers_Regular_1D* hyp1d = new StdMeshers_Regular_1D(hyp++,0,meshgen);
hypoth.push_back(hyp1d);
}
#ifndef EXTERNAL_SMESH
#if SMESH_VERSION_MAJOR < 7
StdMeshers_TrianglePreference* hyp2d_1 = new StdMeshers_TrianglePreference(hyp++,0,meshgen);
hypoth.push_back(hyp2d_1);
#endif