Merge Python 3 porting.

[modules/smesh.git] / src / StdMeshers_I / StdMeshers_CompositeSegment_1D_i.cxx

diff --git a/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx b/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx
index 5dc09cbc533a09f839cc3667a36078e91e1ec5c9..482a9f16a866dc14b728c225ea53f672c593c92d 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -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
-// 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
@@ -43,16 +43,13 @@ using namespace std;
 
 StdMeshers_CompositeSegment_1D_i::StdMeshers_CompositeSegment_1D_i
                                                 ( PortableServer::POA_ptr thePOA,
-                                                  int                     theStudyId,
                                                   ::SMESH_Gen*            theGenImpl )
      : SALOME::GenericObj_i( thePOA ), 
        SMESH_Hypothesis_i( thePOA ), 
        SMESH_Algo_i( thePOA ),
        SMESH_1D_Algo_i( thePOA )
 {
-  MESSAGE( "StdMeshers_CompositeSegment_1D_i::StdMeshers_CompositeSegment_1D_i" );
   myBaseImpl = new ::StdMeshers_CompositeSegment_1D( theGenImpl->GetANewId(),
-                                                     theStudyId,
                                                      theGenImpl );
 }
 
@@ -66,7 +63,6 @@ StdMeshers_CompositeSegment_1D_i::StdMeshers_CompositeSegment_1D_i
 
 StdMeshers_CompositeSegment_1D_i::~StdMeshers_CompositeSegment_1D_i()
 {
-  MESSAGE( "StdMeshers_CompositeSegment_1D_i::~StdMeshers_CompositeSegment_1D_i" );
 }
 
 //=============================================================================
@@ -79,7 +75,6 @@ StdMeshers_CompositeSegment_1D_i::~StdMeshers_CompositeSegment_1D_i()
 
 ::StdMeshers_CompositeSegment_1D* StdMeshers_CompositeSegment_1D_i::GetImpl()
 {
-  MESSAGE( "StdMeshers_CompositeSegment_1D_i::GetImpl" );
   return ( ::StdMeshers_CompositeSegment_1D* )myBaseImpl;
 }