X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDSImpl%2FSALOMEDSImpl_GenericVariable.cxx;h=fe847ed61eebd1cffea36492fe588c292104327c;hb=c5f847b188975119a8f06a274987564ac2cbbd48;hp=7de967c2ceb13f8880a7abe4410ae7585d0ceaaa;hpb=7d2fe213bdf5bf962ce11e253020c9d3e0bc1cce;p=modules%2Fyacs.git

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_GenericVariable.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_GenericVariable.cxx
index 7de967c2c..fe847ed61 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_GenericVariable.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_GenericVariable.cxx
@@ -1,35 +1,34 @@
-// Copyright (C) 2008  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+//
 // 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 
+// License as published by the Free Software Foundation; either
+// 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
+// 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 
+// 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
 //
+
 //  File   : SALOMEDSImpl_GenericVariable.cxx
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S.
 //  Module : SALOME
-
+//
 #include "SALOMEDSImpl_GenericVariable.hxx"
 #include "SALOMEDSImpl_Attributes.hxx"
 #include "SALOMEDSImpl_Study.hxx"
 
 #include <string>
+#include <stdlib.h>
 
 
-using namespace std;
-
 //============================================================================
 /*! Function : SALOMEDSImpl_GenericVariable
  *  Purpose  : 
@@ -37,7 +36,7 @@ using namespace std;
 //============================================================================
 SALOMEDSImpl_GenericVariable::
 SALOMEDSImpl_GenericVariable(SALOMEDSImpl_GenericVariable::VariableTypes theType,
-                             const string& theName): 
+                             const std::string& theName): 
   _type(theType),
   _name(theName)
 {}
@@ -65,7 +64,7 @@ SALOMEDSImpl_GenericVariable::VariableTypes SALOMEDSImpl_GenericVariable::Type()
  *  Purpose  : 
  */
 //============================================================================
-string SALOMEDSImpl_GenericVariable::Name() const
+std::string SALOMEDSImpl_GenericVariable::Name() const
 {
   return _name;
 }
@@ -103,7 +102,7 @@ bool SALOMEDSImpl_GenericVariable::setName(const std::string& theName)
  *  Purpose  : 
  */
 //============================================================================
-SALOMEDSImpl_GenericVariable::VariableTypes SALOMEDSImpl_GenericVariable::String2VariableType(const string& theStrType)
+SALOMEDSImpl_GenericVariable::VariableTypes SALOMEDSImpl_GenericVariable::String2VariableType(const std::string& theStrType)
 {
   return(SALOMEDSImpl_GenericVariable::VariableTypes)atoi((char*)theStrType.c_str());
 }
@@ -113,9 +112,9 @@ SALOMEDSImpl_GenericVariable::VariableTypes SALOMEDSImpl_GenericVariable::String
  *  Purpose  : 
  */
 //============================================================================
-string SALOMEDSImpl_GenericVariable::Save() const
+std::string SALOMEDSImpl_GenericVariable::Save() const
 {
-  return string();
+  return std::string();
 }
 
 
@@ -124,18 +123,18 @@ string SALOMEDSImpl_GenericVariable::Save() const
  *  Purpose  : 
  */
 //============================================================================
-string SALOMEDSImpl_GenericVariable::SaveToScript() const
+std::string SALOMEDSImpl_GenericVariable::SaveToScript() const
 {
-  return string();
+  return std::string();
 }
 //============================================================================
 /*! Function : SaveType
  *  Purpose  : 
  */
 //============================================================================
-string SALOMEDSImpl_GenericVariable::SaveType() const
+std::string SALOMEDSImpl_GenericVariable::SaveType() const
 {
-  return string();
+  return std::string();
 }
 
 //============================================================================
@@ -143,6 +142,6 @@ string SALOMEDSImpl_GenericVariable::SaveType() const
  *  Purpose  : 
  */
 //============================================================================
-void SALOMEDSImpl_GenericVariable::Load(const string& theStrValue)
+void SALOMEDSImpl_GenericVariable::Load(const std::string& theStrValue)
 {
 }