Merge remote-tracking branch 'origin/vsr/fix_single_study_pb' into pre/fix_single_study

[modules/kernel.git] / src / GenericObj / SALOME_GenericObj_wrap.hxx

diff --git a/src/GenericObj/SALOME_GenericObj_wrap.hxx b/src/GenericObj/SALOME_GenericObj_wrap.hxx
index 594f8c7c5ae9ecd76bb6394ffc1a6a27de3c15ff..3ef0edd89b3e84d4f23844d9f9d92e06a3359a41 100644 (file)
--- a/src/GenericObj/SALOME_GenericObj_wrap.hxx
+++ b/src/GenericObj/SALOME_GenericObj_wrap.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -82,7 +82,7 @@ namespace SALOME
       : _obj( obj ), _isOwn( true )
     {}
     GenericObj_wrap( const GenericObj_wrap& wrap )
-      : _obj( wrap.in() ), _isOwn( wrap._getIsOwn() )
+      : _obj( wrap._obj ), _isOwn( wrap._getIsOwn() )
     {
       _register();
     }
@@ -115,7 +115,7 @@ namespace SALOME
     GenericObj_wrap& operator=( const GenericObj_wrap& wrap )
     {
       _release();
-      _obj   = wrap.in();
+      _obj   = wrap._obj;//wrap.in();
       _isOwn = wrap._getIsOwn();
       _register();
       return *this;