To provide compatibility between 4.2.2, 4.2.6 & 4.4 VTK versions

diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index 65073f127f5cbeb3375ee056f0002eb6ad3b77c1..495657d2e1b14d85428ffe7fa1d313de1549bafb 100644 (file)
--- a/src/SVTK/SALOME_Actor.cxx
+++ b/src/SVTK/SALOME_Actor.cxx
@@ -617,7 +617,6 @@ SALOME_Actor
       if(aMapIter != aVectorIdsMap.end()){
        const SVTK_RectPicker::TVectorIds& aVectorIds = aMapIter->second;
        vtkIdType anEnd = aVectorIds.size();
-       SVTK_RectPicker::TVectorIds::const_iterator anIdIter = aVectorIds.begin();
        for(vtkIdType anId = 0; anId < anEnd; anId++ ) {
          int aPointId = aVectorIds[anId];
          if( aPointId >= 0 && mySelector->IsValid( this, aPointId, true ) ) {
@@ -678,7 +677,6 @@ SALOME_Actor
       if(aMapIter != aVectorIdsMap.end()){
        const SVTK_RectPicker::TVectorIds& aVectorIds = aMapIter->second;
        vtkIdType anEnd = aVectorIds.size();
-       SVTK_RectPicker::TVectorIds::const_iterator anIdIter = aVectorIds.begin();
        for(vtkIdType anId = 0; anId < anEnd; anId++ ) {
          int aCellId = aVectorIds[anId];
          if ( !mySelector->IsValid( this, aCellId ) )

diff --git a/src/SVTK/SVTK_CubeAxesActor2D.h b/src/SVTK/SVTK_CubeAxesActor2D.h
index 1de1c1ce84ef02cba8887db89704a7457fca5774..44e3e9810c23f57eb0336957a1e9e54b723666aa 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesActor2D.h
+++ b/src/SVTK/SVTK_CubeAxesActor2D.h
@@ -41,7 +41,8 @@ class vtkPolyDataMapper;
 class vtkRectilinearGridGeometryFilter;
 class VTKViewer_Transform;
 
-#include <SVTK.h>
+#include "SVTK.h"
+#include "VTKViewer.h"
 
 #ifndef WNT
 class VTK_HYBRID_EXPORT SVTK_CubeAxesActor2D : public vtkCubeAxesActor2D

diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h
index 2606aa471d031ec0dd6080ed3d326612ff298c4f..04ae5b850c5453e25f008620d29154d768362793 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.h
+++ b/src/SVTK/SVTK_DeviceActor.h
@@ -29,6 +29,9 @@
 #ifndef SVTK_DEVICE_ACTOR_H
 #define SVTK_DEVICE_ACTOR_H
 
+#include "SVTK.h"
+#include "VTKViewer.h"
+
 #include <vector>
 
 #include <vtkLODActor.h>
@@ -59,7 +62,7 @@ namespace SVTK
 
 
 //----------------------------------------------------------------------------
-class SVTK_DeviceActor: public vtkLODActor
+class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
 {
  public:
   vtkTypeMacro(SVTK_DeviceActor,vtkLODActor);

diff --git a/src/SVTK/SVTK_RectPicker.h b/src/SVTK/SVTK_RectPicker.h
index e994f713235d27a32032162344cba6258d6802eb..77c9a3b16674543b3c743ff6ddc36c9fe20535b9 100644 (file)
--- a/src/SVTK/SVTK_RectPicker.h
+++ b/src/SVTK/SVTK_RectPicker.h
@@ -29,6 +29,7 @@
 #define __SVTK_RectPicker_h
 
 #include "SVTK.h"
+#include "VTKViewer.h"
 
 #include <map>
 #include <vector>

diff --git a/src/SVTK/SVTK_Renderer.h b/src/SVTK/SVTK_Renderer.h
index d593643963675016bd109f3e56f3a5f9f5ace077..14cc30696175da36a5711d32089c3b148121a727 100644 (file)
--- a/src/SVTK/SVTK_Renderer.h
+++ b/src/SVTK/SVTK_Renderer.h
@@ -30,6 +30,7 @@
 #define SVTK_Renderer_h
 
 #include "SVTK.h"
+#include "VTKViewer.h"
 
 #include <vtkObject.h>
 #include <vtkSmartPointer.h>