Merge from V6_5_BR 05/06/2012

[modules/smesh.git] / src / DriverUNV / UNV2411_Structure.hxx

diff --git a/src/DriverUNV/UNV2411_Structure.hxx b/src/DriverUNV/UNV2411_Structure.hxx
index a35b393dd651ed3de023274924c81f80c0aa46a0..99908b4b12f279e3997963e5d1e6a6b2e5d39f4f 100644 (file)
--- a/src/DriverUNV/UNV2411_Structure.hxx
+++ b/src/DriverUNV/UNV2411_Structure.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
@@ -25,21 +25,23 @@
 
 #include "SMESH_DriverUNV.hxx"
 
-#include <map>
+#include <vector>
 #include <fstream>      
 
 namespace UNV2411{
   
+  typedef int TNodeLab; // type of node label
+
   struct MESHDRIVERUNV_EXPORT TRecord{
     TRecord();
+    TNodeLab label;
     int exp_coord_sys_num;  // export coordinate system number
     int disp_coord_sys_num;  // displacement coordinate system number
     int color;  // color                                
     double coord[3];  // node coordinates in the part coordinate system
   };
   
-  typedef int TNodeLab; // type of node label
-  typedef std::map<TNodeLab,TRecord> TDataSet;
+  typedef std::vector<TRecord> TDataSet;
 
   MESHDRIVERUNV_EXPORT void
     Read(std::ifstream& in_stream, TDataSet& theDataSet);