CCAR: remove bug in FindOrLoad_Component

[modules/kernel.git] / src / Batch / Batch_MapKey.hxx

diff --git a/src/Batch/Batch_MapKey.hxx b/src/Batch/Batch_MapKey.hxx
index caee3633fec3aff54b255a96e209d36b5b8342c2..c4a7afe2ae21eae823bc9c2fc4f9a9fd8e1b3d4b 100644 (file)
--- a/src/Batch/Batch_MapKey.hxx
+++ b/src/Batch/Batch_MapKey.hxx
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  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.
+//
+//  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
+//
 /*
  * MapKey.hxx : 
  *
@@ -11,32 +32,33 @@
 #ifndef _MAPKEY_H_
 #define _MAPKEY_H_
 
+#include "Batch_Defines.hxx"
+
 
-using namespace std;
 #include <string>
 
 namespace Batch {
 
   // une classe privee pour les differents types
   // ces types ne peuvent pas etre redefinis
-  class MapKey : public string
+  class BATCH_EXPORT MapKey : public std::string
   {
   private:
     friend class Parametre; // seule la classe Parametre peut creer des MapKey
-    MapKey() : string() {}
-    MapKey(const MapKey & mk, size_type pos, size_type npos) : string(mk, pos, npos) {}
-    MapKey(const char * s, size_type n) : string(s, n) {}
-    MapKey(const char * s) : string(s) {}
-    MapKey(size_type n, char c) : string(n, c) {}
+    MapKey() : std::string() {}
+    MapKey(const MapKey & mk, size_type pos, size_type npos) : std::string(mk, pos, npos) {}
+    MapKey(const char * s, size_type n) : std::string(s, n) {}
+    MapKey(const char * s) : std::string(s) {}
+    MapKey(size_type n, char c) : std::string(n, c) {}
 #ifdef __STL_MEMBER_TEMPLATES
     template<class InputIterator>
-    MapKey(InputIterator __begin, InputIterator __end) : string(__begin, __end) {}
+    MapKey(InputIterator __begin, InputIterator __end) : std::string(__begin, __end) {}
 #else
-    MapKey(const_iterator __begin, const_iterator __end) : string(__begin, __end) {}
+    MapKey(const_iterator __begin, const_iterator __end) : std::string(__begin, __end) {}
 #endif
 
   public:
-    MapKey(const MapKey & mk) : string(mk) {}
+    MapKey(const MapKey & mk) : std::string(mk) {}
 
   };