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 'V9_9_BR'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Geometric1D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Geometric1D.cxx
b/src/StdMeshers/StdMeshers_Geometric1D.cxx
index 8de8c92d21bd4f21daebf27372a4a2051febe0af..feb1e5d8ebfecc4f034794ef625f1ad1032343a1 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Geometric1D.cxx
+++ b/
src/StdMeshers/StdMeshers_Geometric1D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
@@
-57,7
+57,6
@@
StdMeshers_Geometric1D::StdMeshers_Geometric1D(int hypId, SMESH_Gen * gen)
//=============================================================================
void StdMeshers_Geometric1D::SetStartLength(double length)
//=============================================================================
void StdMeshers_Geometric1D::SetStartLength(double length)
- throw(SALOME_Exception)
{
if ( _begLength != length )
{
{
if ( _begLength != length )
{
@@
-75,7
+74,6
@@
void StdMeshers_Geometric1D::SetStartLength(double length)
//=============================================================================
void StdMeshers_Geometric1D::SetCommonRatio(double factor)
//=============================================================================
void StdMeshers_Geometric1D::SetCommonRatio(double factor)
- throw(SALOME_Exception)
{
if ( _ratio != factor )
{
{
if ( _ratio != factor )
{
@@
-114,7
+112,7
@@
double StdMeshers_Geometric1D::GetCommonRatio() const
*/
//=============================================================================
*/
//=============================================================================
-
ostream & StdMeshers_Geometric1D::SaveTo(
ostream & save)
+
std::ostream & StdMeshers_Geometric1D::SaveTo(std::
ostream & save)
{
save << _begLength << " " << _ratio << " ";
{
save << _begLength << " " << _ratio << " ";
@@
-129,7
+127,7
@@
ostream & StdMeshers_Geometric1D::SaveTo(ostream & save)
*/
//=============================================================================
*/
//=============================================================================
-
istream & StdMeshers_Geometric1D::LoadFrom(
istream & load)
+
std::istream & StdMeshers_Geometric1D::LoadFrom(std::
istream & load)
{
bool isOK = true;
isOK = static_cast<bool>(load >> _begLength);
{
bool isOK = true;
isOK = static_cast<bool>(load >> _begLength);