From 0397dbe72930a0386a0aec2532f88b99f8a6a75e Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 18 Feb 2013 12:59:33 +0000 Subject: [PATCH] - int _type; // enum hypothesis_type + hypothesis_type _type; // enum hypothesis_type --- src/SMESHDS/SMESHDS_Hypothesis.hxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SMESHDS/SMESHDS_Hypothesis.hxx b/src/SMESHDS/SMESHDS_Hypothesis.hxx index 85e115c05..32705efae 100644 --- a/src/SMESHDS/SMESHDS_Hypothesis.hxx +++ b/src/SMESHDS/SMESHDS_Hypothesis.hxx @@ -39,9 +39,11 @@ class SMESHDS_EXPORT SMESHDS_Hypothesis SMESHDS_Hypothesis(int hypId); virtual ~SMESHDS_Hypothesis(); + enum hypothesis_type { PARAM_ALGO, ALGO_0D, ALGO_1D, ALGO_2D, ALGO_3D }; + const char* GetName() const; - int GetID() const; - int GetType() const; + int GetID() const; + int GetType() const; virtual std::ostream & SaveTo(std::ostream & save)=0; virtual std::istream & LoadFrom(std::istream & load)=0; @@ -49,12 +51,10 @@ class SMESHDS_EXPORT SMESHDS_Hypothesis virtual bool operator==(const SMESHDS_Hypothesis& other) const; bool operator!=(const SMESHDS_Hypothesis& other) const { return !(*this==other); } - enum hypothesis_type { PARAM_ALGO, ALGO_0D, ALGO_1D, ALGO_2D, ALGO_3D }; - protected: - std::string _name; // identifier if hypothesis type - int _hypId; // ID unique within application session - int _type; // enum hypothesis_type + std::string _name; // identifier of hypothesis type + int _hypId; // ID unique within application session + hypothesis_type _type; // enum hypothesis_type }; #endif -- 2.39.2