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

diff --git a/src/GMSHPlugin/GMSHPlugin_Hypothesis.cxx b/src/GMSHPlugin/GMSHPlugin_Hypothesis.cxx
index d6e197c250646cfbb50c47cc90ee83543722d02e..3e71467a62645537c2955da3eb049a07189a0561 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_Hypothesis.cxx
+++ b/src/GMSHPlugin/GMSHPlugin_Hypothesis.cxx
@@ -189,7 +189,7 @@ void GMSHPlugin_Hypothesis::UnsetCompoundOnEntry(const std::string& entry)
   }
 }
 
-ostream & GMSHPlugin_Hypothesis::SaveTo(ostream & save)
+std::ostream & GMSHPlugin_Hypothesis::SaveTo(std::ostream & save)
 {
   save << (int)_is2d << " " << _algo2d;
   if (!_is2d)
@@ -214,7 +214,7 @@ ostream & GMSHPlugin_Hypothesis::SaveTo(ostream & save)
   return save;
 }
 
-istream & GMSHPlugin_Hypothesis::LoadFrom(istream & load)
+std::istream & GMSHPlugin_Hypothesis::LoadFrom(std::istream & load)
 {
   bool isOK = true;
   int is;

diff --git a/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx b/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx
index a66ba28658b127bfaee2d2c24cb5e63a4d595b0c..8981db2c10f041e3330adc573fb6c83565694925 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx
+++ b/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx
@@ -30,8 +30,6 @@
 //  Parameters for work of GMSH
 //
 
-using namespace std;
-
 class GMSHPLUGIN_EXPORT GMSHPlugin_Hypothesis: public SMESH_Hypothesis
 {
 public:
@@ -132,8 +130,8 @@ public:
   void UnsetCompoundOnEntry(const std::string& entry);
   
   // Persistence
-  virtual ostream & SaveTo(ostream & save);
-  virtual istream & LoadFrom(istream & load);
+  virtual std::ostream & SaveTo(std::ostream & save);
+  virtual std::istream & LoadFrom(std::istream & load);
 
   /*!
    * \brief Does nothing