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_I
/
StdMeshers_Regular_1D_i.hxx
diff --git
a/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx
b/src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx
index ea299fc98241b75782aa6fc94d9700b5b1e173fa..4c75fc434a8a80a2075771b89ac375ce936887b6 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx
+++ b/
src/StdMeshers_I/StdMeshers_Regular_1D_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
1
2 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
2
2 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 SMESH_I : idl implementation based on 'SMESH' unit's c
al
sses
+// SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
la
sses
// File : StdMeshers_Regular_1D_i.hxx
// Moved here from SMESH_Regular_1D_i.hxx
// Author : Paul RASCLE, EDF
// File : StdMeshers_Regular_1D_i.hxx
// Moved here from SMESH_Regular_1D_i.hxx
// Author : Paul RASCLE, EDF
@@
-47,8
+47,7
@@
class STDMESHERS_I_EXPORT StdMeshers_Regular_1D_i:
public:
// Constructor
StdMeshers_Regular_1D_i( PortableServer::POA_ptr thePOA,
public:
// Constructor
StdMeshers_Regular_1D_i( PortableServer::POA_ptr thePOA,
- int theStudyId,
- ::SMESH_Gen* theGenImpl );
+ ::SMESH_Gen* theGenImpl );
// Destructor
virtual ~StdMeshers_Regular_1D_i();
// Destructor
virtual ~StdMeshers_Regular_1D_i();