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 2e9a740042f7cf26ae1fe2de00b9511b8819b091..7feffdec2b8879b2424636f60b0058d67d888e94 100644 (file)
--- 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<SMESH_Mesh_i*>( theSource);
   SMESH_Group_i* theGroup_i = SMESH::DownCast<SMESH_Group_i*>( theSource);
   SMESH_GroupOnGeom_i* theGroupOnGeom_i = SMESH::DownCast<SMESH_GroupOnGeom_i*>( 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<SMESH_Mesh_i*>( theSource);
   SMESH_Group_i* theGroup_i = SMESH::DownCast<SMESH_Group_i*>( theSource);
   SMESH_GroupOnGeom_i* theGroupOnGeom_i = SMESH::DownCast<SMESH_GroupOnGeom_i*>( 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<SMESH_Mesh_i*>( theSource);
   SMESH_Group_i* theGroup_i = SMESH::DownCast<SMESH_Group_i*>( theSource);
   SMESH_GroupOnGeom_i* theGroupOnGeom_i = SMESH::DownCast<SMESH_GroupOnGeom_i*>( 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<SMESH_Mesh_i*>( theSource);
   SMESH_Group_i* theGroup_i = SMESH::DownCast<SMESH_Group_i*>( theSource);
   SMESH_GroupOnGeom_i* theGroupOnGeom_i = SMESH::DownCast<SMESH_GroupOnGeom_i*>( 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 47b61158e3f0fc97b810f0d49e7ca6279ef8ca96..a771883ecb56156049ee9fd31fa6346a2519be32 100644 (file)
--- a/src/GHS3DPlugin/GHS3DPlugin_i.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_i.cxx
@@ -46,7 +46,7 @@ template <class T> class GHS3DPlugin_Creator_i:public HypothesisCreator_i<T>
 
 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 9ecba31e376a20fde1753740dcdb3824366cae8d..fecf3e94747be5075b47e581018cc741c8936888 100644 (file)
--- 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