X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverUNV%2FUNV_Utilities.hxx;h=4e5a08408fc9af81edf84734fe1a6e41123cc40e;hb=928a9967c95638ed1b0bc2a1cc60ae7ed1643774;hp=28ebcd17fede540c129cdd7c4dc8de50050f5e8a;hpb=3369d458eaf2f08db6e32b75609679f06771a5cb;p=modules%2Fsmesh.git

diff --git a/src/DriverUNV/UNV_Utilities.hxx b/src/DriverUNV/UNV_Utilities.hxx
index 28ebcd17f..4e5a08408 100644
--- a/src/DriverUNV/UNV_Utilities.hxx
+++ b/src/DriverUNV/UNV_Utilities.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  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
@@ -20,8 +20,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef MED_Utilities_HeaderFile
-#define MED_Utilities_HeaderFile
+#ifndef UNV_Utilities_HeaderFile
+#define UNV_Utilities_HeaderFile
 
 #include "SMESH_DriverUNV.hxx"
 
@@ -33,8 +33,7 @@
 #include <cassert>
 #include <cstdlib>
 
-namespace UNV{
-  using namespace std;
+namespace UNV {
 
   const size_t theMaxLineLen = 82; // 80 for text + 2 for "\r\n"
 
@@ -44,11 +43,11 @@ namespace UNV{
     PrefixPrinter();
     ~PrefixPrinter();
 
-    static string GetPrefix();
+    static std::string GetPrefix();
   };
 
   /**
-   * @returns \p false when error occured, \p true otherwise.
+   * @returns \p false when error occurred, \p true otherwise.
    * Adjusts the \p in_stream to the beginning of the
    * dataset \p ds_name.
    */
@@ -80,6 +79,8 @@ namespace UNV{
       }
       if (news == ds_name)
         return true;
+
+      olds.clear();
     }
     // should never end up here
     return false;
@@ -95,7 +96,7 @@ namespace UNV{
   {
     /* find "D" in string, start looking at
      * 6th element, to improve speed.
-     * We dont expect a "D" earlier
+     * We don't expect a "D" earlier
      */
     const size_t position = number.find("D",6);
     if ( position != std::string::npos )