Salome HOME
projects
/
modules
/
hexablock.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/hexablock.git]
/
src
/
HEXABLOCK
/
HexEltBase.cxx
diff --git
a/src/HEXABLOCK/HexEltBase.cxx
b/src/HEXABLOCK/HexEltBase.cxx
old mode 100755
(executable)
new mode 100644
(file)
index
723bd6b
..
41a4aeb
--- a/
src/HEXABLOCK/HexEltBase.cxx
+++ b/
src/HEXABLOCK/HexEltBase.cxx
@@
-1,7
+1,7
@@
// C++ : Element de base
// C++ : Element de base
-// Copyright (C) 2009-20
16
CEA/DEN, EDF R&D
+// Copyright (C) 2009-20
22
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-173,14
+173,14
@@
bool EltBase::debug (int niv)
return el_root != NULL && el_root->getLevel() > niv ;
}
// ========================================================= getNextName
return el_root != NULL && el_root->getLevel() > niv ;
}
// ========================================================= getNextName
-string EltBase::getNextName ()
+st
d::st
ring EltBase::getNextName ()
{
if (el_root != NULL)
return el_root->getNextName (el_type);
char name [16];
makeName (el_type, 0, name);
{
if (el_root != NULL)
return el_root->getNextName (el_type);
char name [16];
makeName (el_type, 0, name);
- return string (name);
+ return st
d::st
ring (name);
}
END_NAMESPACE_HEXA
}
END_NAMESPACE_HEXA