From 9c951a48ef949b17e86b7e3e3fc3b48e2ab42f95 Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 6 Jul 2011 06:50:17 +0000 Subject: [PATCH] Porting SALOME 6.3.0 on windows platform. --- src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx | 4 ++-- src/GHS3DPlugin/GHS3DPlugin_i.cxx | 2 +- src/GHS3DPlugin/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx index 2e9a740..4dd927c 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx @@ -801,7 +801,7 @@ bool GHS3DPlugin_Hypothesis_i::SetEnforcedMeshSizeWithGroup(SMESH::SMESH_IDSourc SMESH_Mesh_i* theMesh_i = SMESH::DownCast( theSource); SMESH_Group_i* theGroup_i = SMESH::DownCast( theSource); SMESH_GroupOnGeom_i* theGroupOnGeom_i = SMESH::DownCast( theSource); - if (theGroup_i or theGroupOnGeom_i) + if (theGroup_i || theGroupOnGeom_i) { SMESH::TPythonDump () << "isDone = " << _this() << ".SetEnforcedMeshSizeWithGroup( " << theSource << ", " << theType << ", " << theSize << ", \"" << theGroupName << "\" )"; @@ -833,7 +833,7 @@ bool GHS3DPlugin_Hypothesis_i::SetEnforcedMeshSize(SMESH::SMESH_IDSource_ptr the SMESH_Mesh_i* theMesh_i = SMESH::DownCast( theSource); SMESH_Group_i* theGroup_i = SMESH::DownCast( theSource); SMESH_GroupOnGeom_i* theGroupOnGeom_i = SMESH::DownCast( theSource); - if (theGroup_i or theGroupOnGeom_i) + if (theGroup_i || theGroupOnGeom_i) { SMESH::TPythonDump () << "isDone = " << _this() << ".SetEnforcedMeshSize( " << theSource << ", " << theType << ", " << theSize << " )"; diff --git a/src/GHS3DPlugin/GHS3DPlugin_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_i.cxx index 47b6115..a771883 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_i.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_i.cxx @@ -46,7 +46,7 @@ template class GHS3DPlugin_Creator_i:public HypothesisCreator_i extern "C" { - GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName); + GHS3DPLUGIN_EXPORT GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName); GHS3DPLUGIN_EXPORT GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName) diff --git a/src/GHS3DPlugin/Makefile.am b/src/GHS3DPlugin/Makefile.am index 9ecba31..ffd8704 100644 --- a/src/GHS3DPlugin/Makefile.am +++ b/src/GHS3DPlugin/Makefile.am @@ -62,4 +62,4 @@ libGHS3DEngine_la_LDFLAGS = \ $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \ $(MED_LDFLAGS) -lSalomeIDLMED \ $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHDS -lSMDS -lStdMeshers \ - $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics + $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics -lSalomeNS -- 2.39.2