From: vsr Date: Tue, 19 Jul 2011 09:55:28 +0000 (+0000) Subject: Merge from V6_3_1_WIN (Win32 porting) 19/07/2011 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8a880b9881d220f56a8644e9416ce5a95e65ae6b;p=plugins%2Fghs3dplugin.git Merge from V6_3_1_WIN (Win32 porting) 19/07/2011 --- diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx index 2e9a740..7feffde 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx @@ -728,7 +728,7 @@ bool GHS3DPlugin_Hypothesis_i::SetEnforcedMeshWithGroup(SMESH::SMESH_IDSource_pt 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() << ".SetEnforcedMeshWithGroup( " << theSource << ", " << theType << ", \"" << theGroupName << "\" )"; @@ -761,7 +761,7 @@ bool GHS3DPlugin_Hypothesis_i::SetEnforcedMesh(SMESH::SMESH_IDSource_ptr theSour 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() << ".SetEnforcedMesh( " << theSource << ", " << theType << " )"; @@ -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..fecf3e9 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 -lOpUtil