Merging from V4_1_0_maintainance for porting on Win32 Platform

[modules/kernel.git] / src / Batch / Batch_BatchManagerCatalog.cxx

diff --git a/src/Batch/Batch_BatchManagerCatalog.cxx b/src/Batch/Batch_BatchManagerCatalog.cxx
index 437be93fb7d6cd0fb89ecfa93b5dda0ec4b2fbaf..07bcd0048e59e5fcc638fff95ffbafac34cff9c4 100644 (file)
--- a/src/Batch/Batch_BatchManagerCatalog.cxx
+++ b/src/Batch/Batch_BatchManagerCatalog.cxx
@@ -1,3 +1,22 @@
+// Copyright (C) 2005  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
+//
 /*
  * BatchManagerCatalog.cxx : 
  *
@@ -12,11 +31,13 @@
 #include <map>
 #include "Batch_BatchManagerCatalog.hxx"
 #include "Batch_FactBatchManager.hxx"
+using namespace std;
 
 namespace Batch {
 
   pthread_mutex_t BatchManagerCatalog::_mutex = PTHREAD_MUTEX_INITIALIZER;
-  map<string, FactBatchManager *> * BatchManagerCatalog::_p_catalog = 0;
+  std::map<string, FactBatchManager *> * BatchManagerCatalog::_p_catalog = 0;
+  BatchManagerCatalog BatchManagerCatalog::theCatalog;
 
   // Constructeur
   BatchManagerCatalog::BatchManagerCatalog()
@@ -27,7 +48,7 @@ namespace Batch {
   // Destructeur
   BatchManagerCatalog::~BatchManagerCatalog()
   {
-    // Nothing to do
+    delete BatchManagerCatalog::_p_catalog;
   }
 
   // Functor
@@ -41,7 +62,7 @@ namespace Batch {
     if (pFBM) { // *** section critique ***
       pthread_mutex_lock(&_mutex);
 
-      if (! BatchManagerCatalog::_p_catalog) BatchManagerCatalog::_p_catalog = new map<string, FactBatchManager *>;
+      if (! BatchManagerCatalog::_p_catalog) BatchManagerCatalog::_p_catalog = new std::map<string, FactBatchManager *>;
       (*BatchManagerCatalog::_p_catalog)[type] = pFBM;
 
       pthread_mutex_unlock(&_mutex);
@@ -53,7 +74,7 @@ namespace Batch {
     return BatchManagerCatalog::getFactBatchManager(type);
   }
 
-  map<string, FactBatchManager *> * BatchManagerCatalog::dict() const
+  std::map<string, FactBatchManager *> * BatchManagerCatalog::dict() const
   {
     return _p_catalog;
   }
@@ -63,7 +84,7 @@ namespace Batch {
     ostringstream oss;
     oss << "<BatchManagerCatalog contains {";
     string sep;
-    for(map<string, FactBatchManager *>::const_iterator it = (*_p_catalog).begin(); it != (*_p_catalog).end(); it++, sep=", ") {
+    for(std::map<string, FactBatchManager *>::const_iterator it = (*_p_catalog).begin(); it != (*_p_catalog).end(); it++, sep=", ") {
       oss << sep << "'" << (*it).first << "' : '" << (*it).second->__repr__() << "'";
     }
     oss << "}>";