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
Merge branch 'master' into V9_3_BR
[modules/smesh.git]
/
src
/
DriverUNV
/
UNV_Utilities.hxx
diff --git
a/src/DriverUNV/UNV_Utilities.hxx
b/src/DriverUNV/UNV_Utilities.hxx
index 50a53a75f16112200b24896e4420aff7dac71c16..e41ff1ba3961e8c0ecff075ec7e5fe9f83b7e8d3 100644
(file)
--- a/
src/DriverUNV/UNV_Utilities.hxx
+++ b/
src/DriverUNV/UNV_Utilities.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,8
+20,8
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#ifndef
MED
_Utilities_HeaderFile
-#define
MED
_Utilities_HeaderFile
+#ifndef
UNV
_Utilities_HeaderFile
+#define
UNV
_Utilities_HeaderFile
#include "SMESH_DriverUNV.hxx"
#include "SMESH_DriverUNV.hxx"
@@
-33,8
+33,7
@@
#include <cassert>
#include <cstdlib>
#include <cassert>
#include <cstdlib>
-namespace UNV{
- using namespace std;
+namespace UNV {
const size_t theMaxLineLen = 82; // 80 for text + 2 for "\r\n"
const size_t theMaxLineLen = 82; // 80 for text + 2 for "\r\n"
@@
-44,11
+43,11
@@
namespace UNV{
PrefixPrinter();
~PrefixPrinter();
PrefixPrinter();
~PrefixPrinter();
- static string GetPrefix();
+ static st
d::st
ring GetPrefix();
};
/**
};
/**
- * @returns \p false when error occured, \p true otherwise.
+ * @returns \p false when error occur
r
ed, \p true otherwise.
* Adjusts the \p in_stream to the beginning of the
* dataset \p ds_name.
*/
* Adjusts the \p in_stream to the beginning of the
* dataset \p ds_name.
*/
@@
-56,24
+55,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;
@@
-90,17
+92,17
@@
namespace UNV{
*/
inline double D_to_e(std::string& number)
{
*/
inline double D_to_e(std::string& number)
{
- /* find "D" in string, start looking at
+ /* find "D" in string, start looking at
* 6th element, to improve speed.
* 6th element, to improve speed.
- * We dont expect a "D" earlier
+ * We don
'
t expect a "D" earlier
*/
*/
- const
in
t position = number.find("D",6);
- if
(position != std::string::npos){
- number.replace(position, 1, "e");
- }
+ const
size_
t position = number.find("D",6);
+ if
( position != std::string::npos )
+ number.replace(position, 1, "e");
+
return atof (number.c_str());
}
return atof (number.c_str());
}
-
+
/**
* @returns \p false when file is incorrect, \p true otherwise.
* Check file with name \p theFileName for correct terminate
/**
* @returns \p false when file is incorrect, \p true otherwise.
* Check file with name \p theFileName for correct terminate
@@
-128,15
+130,14
@@
namespace UNV{
*/
inline std::string read_line(std::ifstream& in_stream, const bool next=true)
{
*/
inline std::string read_line(std::ifstream& in_stream, const bool next=true)
{
-
char line[theMaxLineLen]
;
-
in_stream.getline( line, theMaxLineLen
);
+
std::string resLine
;
+
std::getline( in_stream, resLine
);
if ( next )
if ( next )
-
in_stream.getline( line, theMaxLineLen
);
+
std::getline( in_stream, resLine
);
- std::string resLine = line;
if ( resLine.size() > 0 && resLine[ resLine.size()-1 ] == '\r' )
resLine.resize( resLine.size()-1 );
if ( resLine.size() > 0 && resLine[ resLine.size()-1 ] == '\r' )
resLine.resize( resLine.size()-1 );
- return
l
ine;
+ return
resL
ine;
}
};
}
};