Fix compilation problems on Win32 platform

diff --git a/src/CONVERTOR/VISU_IDMapper.hxx b/src/CONVERTOR/VISU_IDMapper.hxx
index 4ef68e307e23b0dd1a236f5c39b60d4ae0b85dda..9a711d20fa3f43e04b45320c6b2eefd8f8434fa0 100644 (file)
--- a/src/CONVERTOR/VISU_IDMapper.hxx
+++ b/src/CONVERTOR/VISU_IDMapper.hxx
@@ -53,7 +53,7 @@ namespace VISU
 
 
   //---------------------------------------------------------------
-  class TStructuredId
+  class VISU_CONVERTOR_EXPORT TStructuredId
   {
     vtkIdType myData[3];
 

diff --git a/src/CONVERTOR/VISU_TableReader.hxx b/src/CONVERTOR/VISU_TableReader.hxx
index 1b724c34819ace3bbdf9718ee71021e3cfd50b9f..17082a310d0ef248f88f2f84c57460cf0b064dcc 100644 (file)
--- a/src/CONVERTOR/VISU_TableReader.hxx
+++ b/src/CONVERTOR/VISU_TableReader.hxx
@@ -101,7 +101,8 @@ namespace VISU
 
   //---------------------------------------------------------------
   typedef std::vector<PTableIDMapper> TTableContainer;
-  void ImportTables( const char* theFileName, TTableContainer& theContainer );
+  VISU_CONVERTOR_EXPORT 
+    void ImportTables( const char* theFileName, TTableContainer& theContainer );
 
 
   //---------------------------------------------------------------

diff --git a/src/PIPELINE/VISU_DeformationPL.cxx b/src/PIPELINE/VISU_DeformationPL.cxx
index 2189b2287df0e7baf464e8939673620c531ad360..88e29868af29975689e2ee511b0c042ea0ce22ac 100755 (executable)
--- a/src/PIPELINE/VISU_DeformationPL.cxx
+++ b/src/PIPELINE/VISU_DeformationPL.cxx
@@ -88,6 +88,7 @@ VISU_DeformationPL::GetMTime(){
   aTime = std::max(aTime,myInputPassFilter->GetMTime());
   aTime = std::max(aTime,myOutputPassFiler->GetMTime());
   aTime = std::max(aTime,myCellDataToPointData->GetMTime());
+  return 0;
 }
 
 //----------------------------------------------------------------------------

diff --git a/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx b/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx
index 0053c13ece0245cd0b044ddccc0efa9731b27bdf..40f41d340a2b87876f2a24b224737609a0fe2d70 100644 (file)
--- a/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx
+++ b/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx
@@ -20,9 +20,11 @@
 #ifndef VISU_ElnoDisassembleFilter_H
 #define VISU_ElnoDisassembleFilter_H
 
+#include "VISUPipeline.hxx"
+
 #include <vtkUnstructuredGridAlgorithm.h>
 
-class VISU_ElnoDisassembleFilter : public vtkUnstructuredGridAlgorithm
+class VISU_PIPELINE_EXPORT VISU_ElnoDisassembleFilter : public vtkUnstructuredGridAlgorithm
 {
 public:
   typedef vtkUnstructuredGridAlgorithm Superclass;

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index ce7b667ac1edffb83e6d2908952d830bc296b17a..d16325ac2ef6a6c43ec09bc950bba86752a96c6c 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -467,7 +467,7 @@ void VisuGUI_CutPlanesPane::onVectorialFieldChanged(int pos){
 }
 
 void VisuGUI_CutPlanesPane::onDeformationCheck(bool Flag){
-  if(!myCutPlanes || !hasInit) return;
+  if(!(bool)myCutPlanes || !hasInit) return;
   myCutPlanes->UseDeformation(Flag);
   InitVectorialField();
   DrawTable();

diff --git a/src/VISUGUI/VisuGUI_Table3dDlg.cxx b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
index 6c961fbf2c40acb4db28c354a1b2ccbf666c5eb1..72d1ca18b681ed49f59cea6945a580b095efd23f 100644 (file)
--- a/src/VISUGUI/VisuGUI_Table3dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
@@ -580,6 +580,15 @@ void VisuGUI_TableScalarBarPane::XYChanged( double )
   }
 }
 
+//----------------------------------------------------------------------------
+/*!
+  
+*/
+void VisuGUI_TableScalarBarPane::changeScalarMode( int )
+{
+//do nothing
+}
+
 //----------------------------------------------------------------------------
 /*!
   Sets size and position

diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc
index 4184edbc7f6653befecc67a7709c5936514f8872..2d8e89da0ec59f3bcd33412a7cc4deecbe84c9be 100644 (file)
--- a/src/VISU_I/VISU_Result_i.cc
+++ b/src/VISU_I/VISU_Result_i.cc
@@ -43,6 +43,8 @@
 #include "SalomeApp_Study.h"
 #include "SalomeApp_Application.h"
 
+#include "MED_Factory.hxx"
+
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>