From: jfa <jfa@opencascade.com>
Date: Tue, 3 Feb 2009 15:38:51 +0000 (+0000)
Subject: A patch by Nicolas GEIMER for Gcc 4.3.2 compatibility.
X-Git-Tag: mergeto_trunk_16Feb09~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d88a597411874a9f4be317d70dce132dd7abb5d9;p=modules%2Fvisu.git

A patch by Nicolas GEIMER for Gcc 4.3.2 compatibility.
---

diff --git a/src/PIPELINE/VISU_PipeLine.cxx b/src/PIPELINE/VISU_PipeLine.cxx
index 9a7d2e2e..d9519403 100644
--- a/src/PIPELINE/VISU_PipeLine.cxx
+++ b/src/PIPELINE/VISU_PipeLine.cxx
@@ -32,9 +32,10 @@
 #include <vtkObjectFactory.h>
 #include <vtkPlane.h>
 
-#include <climits>
 #include <float.h>
 #include <algorithm>
+#include <climits>
+#include <limits>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index d5828be4..482514dd 100644
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -78,6 +78,8 @@
 #include <vtkDataSetMapper.h>
 #include <vtkDataSet.h>
 
+#include <limits>
+
 using namespace std;
 
 //extern VisuGUI *visuGUI;
diff --git a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
index b7acd57f..3d57aa32 100644
--- a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
@@ -60,6 +60,8 @@
 #include <QPushButton>
 #include <QLabel>
 
+#include <limits>
+
 #define MYDEBUG 0
 
 /*!
diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
index edbb2481..b7e41e4d 100644
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
@@ -53,6 +53,7 @@
 #include <QKeyEvent>
 
 #include <math.h>
+#include <limits>
 
 using namespace std;
 
diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.cxx b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
index 894305dc..e46f4498 100644
--- a/src/VISUGUI/VisuGUI_VectorsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
@@ -55,6 +55,8 @@
 #include <QPushButton>
 #include <QKeyEvent>
 
+#include <limits>
+
 using namespace std;
 
 /*!
diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc
index d82c7d7c..a09c1cc1 100644
--- a/src/VISU_I/VISU_ColoredPrs3d_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc
@@ -171,18 +171,24 @@ namespace VISU
 //---------------------------------------------------------------
 VISU::ColoredPrs3d_i::
 ColoredPrs3d_i(EPublishInStudyMode thePublishInStudyMode) :
-  myPublishInStudyMode(thePublishInStudyMode),
-  myIsTimeStampFixed(thePublishInStudyMode == EPublishUnderTimeStamp),
+  myIsRestored(true),
+  myRestoringSObject( SALOMEDS::SObject::_nil() ),
   myEntity( VISU::Entity( -1 ) ),
   myPreviousEntity( VISU::Entity( -1 ) ),
   myTimeStampNumber( -1 ),
   myPreviousTimeStampNumber( -1 ),
+  myIsTimeStampFixed(thePublishInStudyMode == EPublishUnderTimeStamp),
+  myPublishInStudyMode(thePublishInStudyMode),
   myIsUnits( true ),
+  myNumberOfLabels( -1 ),
   myOrientation( VISU::ColoredPrs3dBase::HORIZONTAL ),
+  //myPosition[2], myWidth, myHeight, myTitleWidth, myTitleHeight,
+  //myLabelWidth, myLabelHeight, myBarWidth, myBarHeight,
+  //myIsBoldTitle, myIsItalicTitle, myIsShadowTitle, myTitFontType, myTitleColor[3],
+  //myIsBoldLabel, myIsItalicLabel, myIsShadowLabel, myLblFontType, myLabelColor[3],
   myColoredPL(NULL),
   myIsFixedRange(false),
-  myIsRestored(true)/* RKV : Begin*/,
-  myIsDistributionVisible(false)/* RKV : End*/
+  myIsDistributionVisible(false)
 {}
 
 //---------------------------------------------------------------