merge from BR_KERNEL_REFACTORING

[modules/kernel.git] / src / SALOMEDSImpl / SALOMEDSImpl_AttributeSequenceOfInteger.cxx

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx
index 4120d20b69ad3d9a56b46572cfd186c78e3ad062..b15ecad0275f8ddecc50c98e2675955c4096d65f 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
 //
-//  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 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SALOMEDSImpl_AttributeSequenceOfInteger.cxx
 //  Author : Sergey RUIN
 //  Module : SALOME
@@ -26,8 +27,6 @@
 #include "SALOMEDSImpl_AttributeSequenceOfInteger.hxx"
 #include <string.h>
 
-using namespace std;
-
 //=======================================================================
 //function : GetID
 //purpose  : 
@@ -106,7 +105,7 @@ void SALOMEDSImpl_AttributeSequenceOfInteger::Paste (DF_Attribute* into)
   dynamic_cast<SALOMEDSImpl_AttributeSequenceOfInteger*>(into)->Assign(myValue);
 }
 
-void SALOMEDSImpl_AttributeSequenceOfInteger::Assign(const vector<int>& other) 
+void SALOMEDSImpl_AttributeSequenceOfInteger::Assign(const std::vector<int>& other) 
 {
   CheckLocked();
   Backup();
@@ -144,7 +143,7 @@ void SALOMEDSImpl_AttributeSequenceOfInteger::Remove(const int Index)
 
   if(Index <= 0 || Index > myValue.size()) throw DFexception("Out of range");
 
-  typedef vector<int>::iterator VI;
+  typedef std::vector<int>::iterator VI;
   int i = 1;    
   for(VI p = myValue.begin(); p!=myValue.end(); p++, i++) {
     if(i == Index) {
@@ -169,7 +168,7 @@ int SALOMEDSImpl_AttributeSequenceOfInteger::Value(const int Index)
 
 
 
-string SALOMEDSImpl_AttributeSequenceOfInteger::Save() 
+std::string SALOMEDSImpl_AttributeSequenceOfInteger::Save() 
 {
   int aLength = Length();
   char* aResult = new char[aLength * 25];
@@ -179,13 +178,13 @@ string SALOMEDSImpl_AttributeSequenceOfInteger::Save()
     sprintf(aResult + aPosition , "%d ", Value(i));
     aPosition += strlen(aResult + aPosition);
   }
-  string ret(aResult);
+  std::string ret(aResult);
   delete aResult;
   
   return ret;
 }
-                       
-void SALOMEDSImpl_AttributeSequenceOfInteger::Load(const string& value) 
+                        
+void SALOMEDSImpl_AttributeSequenceOfInteger::Load(const std::string& value) 
 {
   char* aCopy = (char*)value.c_str();
   char* adr = strtok(aCopy, " ");