Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INT PAL 0052864: Assigned algorithms are not shown in Edit Mesh dialog
[modules/smesh.git]
/
src
/
DriverUNV
/
UNV_Utilities.hxx
diff --git
a/src/DriverUNV/UNV_Utilities.hxx
b/src/DriverUNV/UNV_Utilities.hxx
index af5643d0331e15bac00b40a3e8e50a7133d136cb..413ccfa5a254d4c23c0bbfd99c0dd174b13abdda 100644
(file)
--- a/
src/DriverUNV/UNV_Utilities.hxx
+++ b/
src/DriverUNV/UNV_Utilities.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-56,24
+56,27
@@
namespace UNV{
{
assert (in_file.good());
assert (!ds_name.empty());
{
assert (in_file.good());
assert (!ds_name.empty());
-
+
std::string olds, news;
std::string olds, news;
-
+
in_file.seekg(0);
in_file.seekg(0);
- while(true){
+ while(true)
+ {
in_file >> olds >> news;
/*
* a "-1" followed by a number means the beginning of a dataset
* stop combing at the end of the file
*/
in_file >> olds >> news;
/*
* a "-1" followed by a number means the beginning of a dataset
* stop combing at the end of the file
*/
- while( ((olds != "-1") || (news == "-1") ) && !in_file.eof() ){
+ while( ((olds != "-1") || (news == "-1")))
+ {
olds = news;
in_file >> news;
olds = news;
in_file >> news;
- }
- if(in_file.eof())
- {
- in_file.clear();
- return false;
+
+ if ( in_file.eof() || in_file.fail() )
+ {
+ in_file.clear();
+ return false;
+ }
}
if (news == ds_name)
return true;
}
if (news == ds_name)
return true;