[CEA 13302] Policy for c++ files ? using namespaces in c++ header files. boost_ptr...

diff --git a/src/MEDCalc/cmp/MEDCalculator_i.cxx b/src/MEDCalc/cmp/MEDCalculator_i.cxx
index 3c431588aed3790328329d53a05bb73e772b64d6..740ec5a3f8fb7c8ba695144b1291b1c735a26bd9 100644 (file)
--- a/src/MEDCalc/cmp/MEDCalculator_i.cxx
+++ b/src/MEDCalc/cmp/MEDCalculator_i.cxx
@@ -247,7 +247,7 @@ MEDCALC::FieldHandler * MEDCalculator_i::pow(const MEDCALC::FieldHandler & f_hdl
   MEDCouplingFieldDouble* field_result;
   try {
     field_result = field->clone(true);
-    string functionToApply = "u^"+ToString(power);
+    std::string functionToApply = "u^"+ToString(power);
     field_result->applyFunc(functionToApply.c_str());
   }
   catch (INTERP_KERNEL::Exception &ex) {
@@ -255,7 +255,7 @@ MEDCALC::FieldHandler * MEDCalculator_i::pow(const MEDCALC::FieldHandler & f_hdl
   }
 
   // Set the name (the default is the same as the original field)
-  string name(field_result->getName());
+  std::string name(field_result->getName());
   name.append("^");
   name.append(ToString(power));
   field_result->setName(name.c_str());
@@ -286,7 +286,7 @@ MEDCALC::FieldHandler * MEDCalculator_i::lin(const MEDCALC::FieldHandler & f_hdl
   MEDCouplingFieldDouble* field_result;
   try {
     field_result = field->clone(true);
-    string functionToApply = "u*"+ToString(factor)+"+"+ToString(offset);
+    std::string functionToApply = "u*"+ToString(factor)+"+"+ToString(offset);
     field_result->applyFunc(functionToApply.c_str());
   }
   catch (INTERP_KERNEL::Exception &ex) {
@@ -294,7 +294,7 @@ MEDCALC::FieldHandler * MEDCalculator_i::lin(const MEDCALC::FieldHandler & f_hdl
   }
 
   // Set the name (the default is the same as the original field)
-  string name = string("lin(");
+  std::string name = std::string("lin(");
   name.append(field->getName());
   name.append(",factor=");
   name.append(ToString(factor));
@@ -333,7 +333,7 @@ MEDCALC::FieldHandler * MEDCalculator_i::dup(const MEDCALC::FieldHandler & f_hdl
   }
 
   // Set the name (the default is the same as the original field)
-  string name = string("dup(");
+  std::string name = std::string("dup(");
   name.append(field->getName());
   name.append(")");
   field_result->setName(name.c_str());
@@ -376,7 +376,7 @@ MEDCALC::FieldHandler * MEDCalculator_i::fct(const MEDCALC::FieldHandler & f_hdl
     throw KERNEL::createSalomeException(ex.what());
   }
 
-  string name = string("fct("); name.append(field->getName());
+  std::string name = std::string("fct("); name.append(field->getName());
   name.append(",\""); name.append(function);
   name.append(",\""); name.append(ToString(nbResComponents)); name.append("\")");
   field_result->setName(name.c_str());

diff --git a/src/MEDCalc/cmp/MEDDataManager_i.hxx b/src/MEDCalc/cmp/MEDDataManager_i.hxx
index 7a3c2306e556af3591316b7ac53bb009352431a9..dfec823901333535ed6c40f6494c881ccfe06e30 100644 (file)
--- a/src/MEDCalc/cmp/MEDDataManager_i.hxx
+++ b/src/MEDCalc/cmp/MEDDataManager_i.hxx
@@ -34,27 +34,26 @@ using namespace MEDCoupling;
 /*! This map is used for lifecycle management of fields used in this operator */
 #include <map>
 #include <string>
-using namespace std;
 
-typedef map<long,MEDCALC::DatasourceHandler*> DatasourceHandlerMap;
-typedef map<long,MEDCALC::DatasourceHandler*>::iterator DatasourceHandlerMapIterator;
+typedef std::map<long,MEDCALC::DatasourceHandler*> DatasourceHandlerMap;
+typedef std::map<long,MEDCALC::DatasourceHandler*>::iterator DatasourceHandlerMapIterator;
 
-typedef map<long,MEDCALC::MeshHandler*> MeshHandlerMap;
-typedef map<long,MEDCALC::MeshHandler*>::iterator MeshHandlerMapIterator;
+typedef std::map<long,MEDCALC::MeshHandler*> MeshHandlerMap;
+typedef std::map<long,MEDCALC::MeshHandler*>::iterator MeshHandlerMapIterator;
 
-typedef map<long,MEDCALC::FieldseriesHandler*> FieldseriesHandlerMap;
-typedef map<long,MEDCALC::FieldseriesHandler*>::iterator FieldseriesHandlerMapIterator;
+typedef std::map<long,MEDCALC::FieldseriesHandler*> FieldseriesHandlerMap;
+typedef std::map<long,MEDCALC::FieldseriesHandler*>::iterator FieldseriesHandlerMapIterator;
 
-typedef map<long,MEDCALC::FieldHandler*> FieldHandlerMap;
-typedef map<long,MEDCALC::FieldHandler*>::iterator FieldHandlerMapIterator;
-typedef map<long,bool> FieldPersistencyMap;
-typedef map<long,bool>::iterator FieldPersistencyMapIterator;
+typedef std::map<long,MEDCALC::FieldHandler*> FieldHandlerMap;
+typedef std::map<long,MEDCALC::FieldHandler*>::iterator FieldHandlerMapIterator;
+typedef std::map<long,bool> FieldPersistencyMap;
+typedef std::map<long,bool>::iterator FieldPersistencyMapIterator;
 
-typedef map<long,MEDCouplingFieldDouble*> FieldDoubleMap;
-typedef map<long,MEDCouplingFieldDouble*>::iterator FieldDoubleMapIterator;
+typedef std::map<long,MEDCouplingFieldDouble*> FieldDoubleMap;
+typedef std::map<long,MEDCouplingFieldDouble*>::iterator FieldDoubleMapIterator;
 
-typedef map<long,MEDCouplingUMesh*> MeshMap;
-typedef map<long,MEDCouplingUMesh*>::iterator MeshMapIterator;
+typedef std::map<long,MEDCouplingUMesh*> MeshMap;
+typedef std::map<long,MEDCouplingUMesh*>::iterator MeshMapIterator;
 
 #include "MEDCALC.hxx"
 class MEDDataManager_i: public POA_MEDCALC::MEDDataManager,
@@ -140,7 +139,7 @@ private:
   MeshMap _meshMap;
   FieldPersistencyMap _fieldPersistencyMap;
 
-  string _medEventListenerIOR;
+  std::string _medEventListenerIOR;
 
   MEDCALC::FieldHandler * newFieldHandler(const char * fieldname,
                                           const char * meshname,