From 61b14860457855fbc755cdb7e61ec9ed94c2e3cc Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 12 Mar 2019 13:29:34 +0300 Subject: [PATCH] [CEA 13302] Policy for c++ files ? using namespaces in c++ header files. boost_ptr / shared_ptr --- src/GMSHPlugin/GMSHPlugin_Hypothesis.cxx | 4 ++-- src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/GMSHPlugin/GMSHPlugin_Hypothesis.cxx b/src/GMSHPlugin/GMSHPlugin_Hypothesis.cxx index d6e197c..3e71467 100644 --- 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 a66ba28..8981db2 100644 --- 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 -- 2.39.2