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 'V8_4_BR'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_StartEndLength.cxx
diff --git
a/src/StdMeshers/StdMeshers_StartEndLength.cxx
b/src/StdMeshers/StdMeshers_StartEndLength.cxx
index 46cee3f22951040ca01495526c13daa4b0dfa70f..51bb2cf92e91f443425f7c0d6b24ff547d3b4294 100644
(file)
--- a/
src/StdMeshers/StdMeshers_StartEndLength.cxx
+++ b/
src/StdMeshers/StdMeshers_StartEndLength.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH StdMeshers_StartEndLength : implementaion of SMESH idl descriptions
+// SMESH StdMeshers_StartEndLength : implementa
t
ion of SMESH idl descriptions
// File : StdMeshers_StartEndLength.cxx
// Module : SMESH
//
// File : StdMeshers_StartEndLength.cxx
// Module : SMESH
//
@@
-146,22
+146,22
@@
istream & StdMeshers_StartEndLength::LoadFrom(istream & load)
{
bool isOK = true;
int intVal;
{
bool isOK = true;
int intVal;
- isOK = (load >> _begLength);
+ isOK =
static_cast<bool>
(load >> _begLength);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
if (!isOK)
load.clear(ios::badbit | load.rdstate());
- isOK = (load >> _endLength);
+ isOK =
static_cast<bool>
(load >> _endLength);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
if (!isOK)
load.clear(ios::badbit | load.rdstate());
-
- isOK = (load >> intVal);
+
+ isOK =
static_cast<bool>
(load >> intVal);
if (isOK && intVal > 0) {
_edgeIDs.reserve( intVal );
if (isOK && intVal > 0) {
_edgeIDs.reserve( intVal );
- for (
in
t i = 0; i < _edgeIDs.capacity() && isOK; i++) {
- isOK = (load >> intVal);
+ for (
size_
t i = 0; i < _edgeIDs.capacity() && isOK; i++) {
+ isOK =
static_cast<bool>
(load >> intVal);
if ( isOK ) _edgeIDs.push_back( intVal );
}
if ( isOK ) _edgeIDs.push_back( intVal );
}
- isOK = (load >> _objEntry);
+ isOK =
static_cast<bool>
(load >> _objEntry);
}
return load;
}
return load;
@@
-169,7
+169,7
@@
istream & StdMeshers_StartEndLength::LoadFrom(istream & load)
//=============================================================================
/*!
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
*/
//=============================================================================