Porting on Mandrake

diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h
index 870f327a1dabd606b86d698c8b3b890cfd12623a..2e9996f4f7d42a4fb802dc4aced90e86f660a60f 100644 (file)
--- a/src/SVTK/SALOME_Actor.h
+++ b/src/SVTK/SALOME_Actor.h
@@ -33,10 +33,15 @@
 #include "SVTK_Selector.h"
 #include "SVTK.h"
 
-#include "VTKViewer_Actor.h"
-
 #include "SALOME_InteractiveObject.hxx"
 
+// undefining min and max because CASCADE's defines them and
+// it clashes with std::min(), std::max()
+#undef min
+#undef max
+
+#include "VTKViewer_Actor.h"
+
 #include <string>
 #include <vector>
 

diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index 59ece223dd2b15b4baea5e04fdf1ee56e4bd1d9a..a1278dd3522d3b831a682e014aa3e8c053bdb146 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.cxx
@@ -63,10 +63,6 @@
 //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_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h
index acfabc3a42ab942f151d75e5819f1696af548aa9..efcb40f8d1828a5e3f704babe494be103e71c65f 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.h
+++ b/src/SVTK/SVTK_RenderWindowInteractor.h
@@ -34,6 +34,12 @@
 
 #include <vtkSmartPointer.h>
 #include <qwidget.h>
+
+// undefining min and max because CASCADE's defines them and
+// it clashes with std::min(), std::max()
+#undef min
+#undef max
+
 #include <stack>
 
 class vtkGenericRenderWindowInteractor;

diff --git a/src/SVTK/SVTK_Renderer.cxx b/src/SVTK/SVTK_Renderer.cxx
index 8625cbb37e500888585395617302a4c93f3f05d7..a63f35e6564e0ce83daacf85c23718e1abf7c6a0 100644 (file)
--- a/src/SVTK/SVTK_Renderer.cxx
+++ b/src/SVTK/SVTK_Renderer.cxx
@@ -42,6 +42,11 @@
 #include <vtkObjectFactory.h>
 #include <vtkCallbackCommand.h>
 
+// undefining min and max because CASCADE's defines them and
+// it clashes with std::min(), std::max() included in utilities.h
+#undef min
+#undef max
+
 #include "utilities.h"
 
 #ifdef _DEBUG_