Merge from V5_1_main 14/05/2010

[modules/visu.git] / src / CONVERTOR / VISU_Structures_impl.cxx

diff --git a/src/CONVERTOR/VISU_Structures_impl.cxx b/src/CONVERTOR/VISU_Structures_impl.cxx
index eb797c47790b2f77b8c96b02b7d4b0eb04510da4..a0c1012b66523b3498974573bcd694152465c256 100644 (file)
--- a/src/CONVERTOR/VISU_Structures_impl.cxx
+++ b/src/CONVERTOR/VISU_Structures_impl.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,10 +19,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File:
 //  Author:  Alexey PETROV
 //  Module : VISU
-
+//
 #include "VISU_Structures_impl.hxx"
 #include "VISU_PointCoords.hxx"
 #include "VISU_MeshValue.hxx"
@@ -1294,7 +1295,7 @@ namespace VISU
     vtkIdType aNbCells = 0, aCellsSize = 0;
     TFamilySet::const_iterator anIter = myFamilySet.begin();
     for(; anIter != myFamilySet.end(); anIter++){
-      PFamilyImpl aFamily = *anIter;
+      PFamilyImpl aFamily = (*anIter).second;
       aNbCells += aFamily->myNbCells;
       aCellsSize += aFamily->myCellsSize;
     }
@@ -1571,7 +1572,7 @@ namespace VISU
     int aNbGauss = 1;
     TGeom2NbGauss::const_iterator anIter = myGeom2NbGauss.begin();
     for(; anIter != myGeom2NbGauss.end(); anIter++){
-      aNbGauss = std::max(aNbGauss, anIter->second);
+      aNbGauss = std::max<int>(aNbGauss, anIter->second);
     }
     return aNbGauss;
   }