Merge from V6_5_BR 05/06/2012

[modules/smesh.git] / src / SMDS / SMDS_IteratorOnIterators.hxx

diff --git a/src/SMDS/SMDS_IteratorOnIterators.hxx b/src/SMDS/SMDS_IteratorOnIterators.hxx
index 3cad788c70bf0014e610666ca08ef0588813a4fe..105edfdc18abc8cf456435c36a2f94ac051591f6 100644 (file)
--- a/src/SMDS/SMDS_IteratorOnIterators.hxx
+++ b/src/SMDS/SMDS_IteratorOnIterators.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
@@ -46,7 +46,10 @@ protected:
   typename CONTAINER_OF_ITERATORS::iterator _beg, _end;
 public:
   SMDS_IteratorOnIterators(const CONTAINER_OF_ITERATORS& iterators):
-    _iterators( iterators ), _beg( _iterators.begin()), _end(_iterators.end() ) {}
+    _iterators( iterators ), _beg( _iterators.begin()), _end(_iterators.end() )
+  {
+    while ( _beg != _end && !(*_beg)->more()) ++_beg;
+  }
 
   /// Return true iff there are other object in this iterator
   virtual bool more() { return _beg != _end && (*_beg)->more(); }