X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_StdIterator.hxx;h=684c61ddedfa63f946ff88ffbd231cd0d94b4835;hb=14866e630942b5bf53793305c8d01ac390534795;hp=f09647f1ff3fcc4441e3ca21269ff4dcb93fe1ad;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git diff --git a/src/SMDS/SMDS_StdIterator.hxx b/src/SMDS/SMDS_StdIterator.hxx index f09647f1f..684c61dde 100644 --- a/src/SMDS/SMDS_StdIterator.hxx +++ b/src/SMDS/SMDS_StdIterator.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,7 +17,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMDS : implementaion of Salome mesh data structure +// SMESH SMDS : implementation of Salome mesh data structure // File : SMDS_StdIterator.hxx // Created : Fri Feb 5 11:03:46 2010 // Author : Edward AGAPOV (eap) @@ -45,7 +45,7 @@ public: // constructor to use as return from begin() SMDS_StdIterator( PtrSMDSIterator pItr ) - : _value( pItr->more() ? (VALUE)(pItr->next()) : 0 ), _piterator(pItr) + : _value( pItr->more() ? VALUE(pItr->next()) : VALUE(0) ), _piterator(pItr) {} // constructor to use as return from end() SMDS_StdIterator(): _value( 0 ) @@ -58,12 +58,12 @@ public: // Step to the next one _Self& operator++() - { _value = _piterator->more() ? VALUE( _piterator->next()) : 0; return *this; } + { _value = _piterator->more() ? VALUE( _piterator->next()) : VALUE(0); return *this; } // Step to the next one _Self operator++(int) - { _Self res = *this; _value = _piterator->more() ? VALUE( _piterator->next()) : 0; return res; } + { _Self res = *this; _value = _piterator->more() ? VALUE( _piterator->next()) : VALUE(0); return res; } // Test of end bool