From: rnv Date: Fri, 28 Mar 2014 11:41:31 +0000 (+0400) Subject: Compilation on Windows platform. X-Git-Tag: V7_4_0a1~16 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=df5faa3c63b7a8984092e9c04a3c3c480f054a59 Compilation on Windows platform. --- diff --git a/src/DriverMED/DriverMED.hxx b/src/DriverMED/DriverMED.hxx index 857023efe..299b61083 100644 --- a/src/DriverMED/DriverMED.hxx +++ b/src/DriverMED/DriverMED.hxx @@ -23,6 +23,7 @@ // Declarations needed for usage of DriverMED #include "SMDSAbs_ElementType.hxx" +#include "SMESH_DriverMED.hxx" #include @@ -36,10 +37,10 @@ namespace DriverMED /* * Returns MED element geom type (MED::EGeometrieElement) by SMDS type */ - int GetMedGeoType( SMDSAbs_EntityType smdsType ); + MESHDRIVERMED_EXPORT int GetMedGeoType( SMDSAbs_EntityType smdsType ); /* * Returns SMDS element geom type by MED type (MED::EGeometrieElement) */ - SMDSAbs_EntityType GetSMDSType( int medType ); + MESHDRIVERMED_EXPORT SMDSAbs_EntityType GetSMDSType( int medType ); } diff --git a/src/SMESH_I/CMakeLists.txt b/src/SMESH_I/CMakeLists.txt index e9b14c919..3643f0928 100644 --- a/src/SMESH_I/CMakeLists.txt +++ b/src/SMESH_I/CMakeLists.txt @@ -80,6 +80,7 @@ SET(_link_LIBRARIES SMDS SMESHDS SMESHControls + MeshDriverMED ) # --- headers --- diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx index 0a7e33017..016a5098d 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx @@ -5244,6 +5244,7 @@ FaceQuadStruct::Side& FaceQuadStruct::Side::operator=(const Side& otherSide) oSide->contacts[iOC].other_side = this; } } + return *this; } //================================================================================ @@ -5290,6 +5291,7 @@ bool FaceQuadStruct::Side::Reverse(bool keepGrid) grid->Reverse(); } } + return (bool)grid; } //================================================================================