CCAR: import_hook.py was too strict in ensure_list (ImportError raised)

[modules/kernel.git] / src / GenericObj / SALOME_GenericObj_i.cc

diff --git a/src/GenericObj/SALOME_GenericObj_i.cc b/src/GenericObj/SALOME_GenericObj_i.cc
index fe837e3fdfa2fffb382aa5ff4ec7954e467f2c22..1e41fbcb00ff1dd5f782ca02757bae1c96e8a292 100644 (file)
--- a/src/GenericObj/SALOME_GenericObj_i.cc
+++ b/src/GenericObj/SALOME_GenericObj_i.cc
@@ -1,29 +1,30 @@
-//  SALOME_GenericObj_i_CC
+//  Copyright (C) 2007-2010  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
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
+//  SALOME_GenericObj_i_CC
 //  File   : SALOME_GenericObj_i.cc
 //  Author : Alexey PETROV
 //  Module : SALOME
-
+//
 #include "SALOME_GenericObj_i.hh"
 #include "utilities.h"
 
@@ -34,17 +35,16 @@ static int MYDEBUG = 0;
 #endif
 
 using namespace SALOME;
-using namespace std;
 
 GenericObj_i::GenericObj_i(PortableServer::POA_ptr thePOA): myRefCounter(1){
   if(MYDEBUG) 
     MESSAGE("GenericObj_i::GenericObj_i() - this = "<<this<<
            "; CORBA::is_nil(thePOA) = "<<CORBA::is_nil(thePOA));
   if(CORBA::is_nil(thePOA))
-#ifndef WNT
-    myPOA = PortableServer::RefCountServantBase::_default_POA();
+#ifndef WIN32
+    myPOA = PortableServer::ServantBase::_default_POA();
 #else
-    myPOA = RefCountServantBase::_default_POA();
+    myPOA = ServantBase::_default_POA();
 #endif
   else
     myPOA = PortableServer::POA::_duplicate(thePOA);