compilation errors on Mandrake fixed (clashes of CASCADE's min/max definitions and...

diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index 1925bd2a5e7b08218446919ad7d2d18408d16cbd..bb67274d46228f0add4a58fd4d6e8cd5204dca26 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.cxx
@@ -66,6 +66,10 @@
 //VRV: porting on Qt 3.0.5
 #include <algorithm>
 
+// undefining min and max because CASCADE's Xw_Extensions.hxx defines them and
+// it clashes with std::min(), std::max() included in utilities.h
+#undef min
+#undef max
 #include "utilities.h"
 
 using namespace std;

diff --git a/src/SVTK/SVTK_View.cxx b/src/SVTK/SVTK_View.cxx
index f886bbf92a7e3704da97dfedb194f4222021c846..a29e0b4e7e745a7362528f2f91213bf14115f5b7 100644 (file)
--- a/src/SVTK/SVTK_View.cxx
+++ b/src/SVTK/SVTK_View.cxx
@@ -301,5 +301,5 @@ SVTK_InteractorStyle*
 SVTK_View
 ::getInteractorStyle()
 {
-  return myInteractorStyles.empty() ? 0 : myInteractorStyles.top().GetPointer();
+  return myInteractorStyles.isEmpty() ? 0 : myInteractorStyles.top().GetPointer();
 }

diff --git a/src/SVTK/SVTK_View.h b/src/SVTK/SVTK_View.h
index 76079a6a9a6c095f2e4b4541c604945749343fcf..e1229a18de94f677c6dcb1b7c5ec46fb9def1ae5 100644 (file)
--- a/src/SVTK/SVTK_View.h
+++ b/src/SVTK/SVTK_View.h
@@ -6,14 +6,16 @@
 #endif
 
 #include "SVTK.h"
+
 #include "SVTK_Selection.h"
 #include "SVTK_RenderWindowInteractor.h"
 
+
 #include "SALOME_InteractiveObject.hxx"
 
 #include <vtkSmartPointer.h>
 
-#include <stack>
+#include <qvaluestack.h>
 
 class vtkCallbackCommand;
 class VTKViewer_Actor;
@@ -105,7 +107,7 @@ protected:
   void initInteractorStyle( SVTK_InteractorStyle* );
 
   typedef vtkSmartPointer<SVTK_InteractorStyle> PInteractorStyle;
-  std::stack<PInteractorStyle> myInteractorStyles;
+  QValueStack<PInteractorStyle> myInteractorStyles;
 };
 
 #ifdef WIN32