Merge branch 'agy/mem_peak_0_integ'

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

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
index 195de54e3ce176f2705b75bbb5a4fef6314bd4ae..a496c64944793667c3dad0767a4baa60ef43431e 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -26,6 +26,7 @@
 //
 #include "SALOMEDSImpl_AttributeStudyProperties.hxx"
 #include <string.h>
+#include <stdlib.h>
 
 const std::string& SALOMEDSImpl_AttributeStudyProperties::GetID()
 {
@@ -287,7 +288,7 @@ std::string SALOMEDSImpl_AttributeStudyProperties::Save()
     aProperty[a++] = 1;
   }
 
-  //Write delimeter of the section to define end of the modifications section
+  //Write delimiter of the section to define end of the modifications section
   aProperty[a++] = 30;
 
   //Write units if need
@@ -296,7 +297,7 @@ std::string SALOMEDSImpl_AttributeStudyProperties::Save()
     a = strlen(aProperty);
   }
 
-  aProperty[a++] = 1; //delimeter of the units and comments
+  aProperty[a++] = 1; //delimiter of the units and comments
 
   //Write comments if need
   if(comment.size() > 0) {
@@ -304,7 +305,7 @@ std::string SALOMEDSImpl_AttributeStudyProperties::Save()
     a = strlen(aProperty);
   }
   
-  aProperty[a++] = 30; //delimeter of the component versions
+  aProperty[a++] = 30; //delimiter of the component versions
 
   std::map<std::string, std::string>::const_iterator versionsIt;
   for ( versionsIt = versions.begin(); versionsIt != versions.end(); ++versionsIt ) {
@@ -454,7 +455,7 @@ void SALOMEDSImpl_AttributeStudyProperties::Load(const std::string& value)
   
   //Case when study contains units and comment properties
   if( anIndex < value.size() ) {
-    anIndex++; //skip the delimeter of the sections: char(30)
+    anIndex++; //skip the delimiter of the sections: char(30)
     int unitsSize;
     for(unitsSize = 0; aCopy[anIndex+unitsSize] != 1; unitsSize++);