From: ageay <ageay>
Date: Thu, 22 Aug 2013 15:31:20 +0000 (+0000)
Subject: Unwarningization under Win.
X-Git-Tag: B4AnonymousThrow~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3e1d61df898cbc64aeb6a1ae915c85e4f8985eb4;p=modules%2Fmed.git

Unwarningization under Win.
---

diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
index 1d7df48b9..959505b17 100644
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
@@ -35,43 +35,43 @@ namespace INTERP_KERNEL
 {
   class ValueDouble;
 
-  class INTERPKERNEL_EXPORT LeafExpr
+  class LeafExpr
   {
   public:
-    virtual ~LeafExpr();
-    virtual void fillValue(Value *val) const throw(INTERP_KERNEL::Exception) = 0;
-    virtual void compileX86(std::vector<std::string>& ass) const = 0;
-    virtual void compileX86_64(std::vector<std::string>& ass) const = 0;
-    virtual void replaceValues(const std::vector<double>& valuesInExpr) throw(INTERP_KERNEL::Exception) = 0;
-    static LeafExpr *buildInstanceFrom(const std::string& expr) throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT virtual ~LeafExpr();
+    INTERPKERNEL_EXPORT virtual void fillValue(Value *val) const throw(INTERP_KERNEL::Exception) = 0;
+    INTERPKERNEL_EXPORT virtual void compileX86(std::vector<std::string>& ass) const = 0;
+    INTERPKERNEL_EXPORT virtual void compileX86_64(std::vector<std::string>& ass) const = 0;
+    INTERPKERNEL_EXPORT virtual void replaceValues(const std::vector<double>& valuesInExpr) throw(INTERP_KERNEL::Exception) = 0;
+    INTERPKERNEL_EXPORT static LeafExpr *buildInstanceFrom(const std::string& expr) throw(INTERP_KERNEL::Exception);
   };
 
-  class INTERPKERNEL_EXPORT LeafExprVal : public LeafExpr
+  class LeafExprVal : public LeafExpr
   {
   public:
-    LeafExprVal(double value);
-    ~LeafExprVal();
-    void compileX86(std::vector<std::string>& ass) const;
-    void compileX86_64(std::vector<std::string>& ass) const;
-    void fillValue(Value *val) const throw(INTERP_KERNEL::Exception);
-    void replaceValues(const std::vector<double>& valuesInExpr) throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT LeafExprVal(double value);
+    INTERPKERNEL_EXPORT ~LeafExprVal();
+    INTERPKERNEL_EXPORT void compileX86(std::vector<std::string>& ass) const;
+    INTERPKERNEL_EXPORT void compileX86_64(std::vector<std::string>& ass) const;
+    INTERPKERNEL_EXPORT void fillValue(Value *val) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void replaceValues(const std::vector<double>& valuesInExpr) throw(INTERP_KERNEL::Exception);
   private:
     double _value;
   };
 
-  class INTERPKERNEL_EXPORT LeafExprVar : public LeafExpr
+  class LeafExprVar : public LeafExpr
   {
   public:
-    LeafExprVar(const std::string& var);
-    ~LeafExprVar();
-    void compileX86(std::vector<std::string>& ass) const;
-    void compileX86_64(std::vector<std::string>& ass) const;
-    void fillValue(Value *val) const throw(INTERP_KERNEL::Exception);
-    std::string getVar() const { return _var_name; }
-    void prepareExprEvaluation(const std::vector<std::string>& vars, int nbOfCompo, int targetNbOfCompo) const throw(INTERP_KERNEL::Exception);
-    void prepareExprEvaluationVec() const throw(INTERP_KERNEL::Exception);
-    void replaceValues(const std::vector<double>& valuesInExpr) throw(INTERP_KERNEL::Exception);
-    static bool isRecognizedKeyVar(const std::string& var, int& pos);
+    INTERPKERNEL_EXPORT LeafExprVar(const std::string& var);
+    INTERPKERNEL_EXPORT ~LeafExprVar();
+    INTERPKERNEL_EXPORT void compileX86(std::vector<std::string>& ass) const;
+    INTERPKERNEL_EXPORT void compileX86_64(std::vector<std::string>& ass) const;
+    INTERPKERNEL_EXPORT void fillValue(Value *val) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT std::string getVar() const { return _var_name; }
+    INTERPKERNEL_EXPORT void prepareExprEvaluation(const std::vector<std::string>& vars, int nbOfCompo, int targetNbOfCompo) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void prepareExprEvaluationVec() const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void replaceValues(const std::vector<double>& valuesInExpr) throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT static bool isRecognizedKeyVar(const std::string& var, int& pos);
   public:
     static const char END_OF_RECOGNIZED_VAR[];
   private:
diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
index 3797d1567..506d458af 100644
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelValue.hxx
@@ -109,43 +109,43 @@ namespace INTERP_KERNEL
     double _data;
   };
 
-  class INTERPKERNEL_EXPORT ValueUnit : public Value
+  class ValueUnit : public Value
   {
   public:
-    ValueUnit();
-    Value *newInstance() const;
-    void setDouble(double val) throw(INTERP_KERNEL::Exception);
-    void setVarname(int fastPos, const std::string& var) throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT ValueUnit();
+    INTERPKERNEL_EXPORT Value *newInstance() const;
+    INTERPKERNEL_EXPORT void setDouble(double val) throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void setVarname(int fastPos, const std::string& var) throw(INTERP_KERNEL::Exception);
     //
-    DecompositionInUnitBase getData() const { return _data; }
-    void positive() throw(INTERP_KERNEL::Exception);
-    void negate() throw(INTERP_KERNEL::Exception);
-    void sqrt() throw(INTERP_KERNEL::Exception);
-    void cos() throw(INTERP_KERNEL::Exception);
-    void sin() throw(INTERP_KERNEL::Exception);
-    void tan() throw(INTERP_KERNEL::Exception);
-    void acos() throw(INTERP_KERNEL::Exception);
-    void asin() throw(INTERP_KERNEL::Exception);
-    void atan() throw(INTERP_KERNEL::Exception);
-    void cosh() throw(INTERP_KERNEL::Exception);
-    void sinh() throw(INTERP_KERNEL::Exception);
-    void tanh() throw(INTERP_KERNEL::Exception);
-    void abs() throw(INTERP_KERNEL::Exception);
-    void exp() throw(INTERP_KERNEL::Exception);
-    void ln() throw(INTERP_KERNEL::Exception);
-    void log10() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT DecompositionInUnitBase getData() const { return _data; }
+    INTERPKERNEL_EXPORT void positive() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void negate() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void sqrt() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void cos() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void sin() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void tan() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void acos() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void asin() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void atan() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void cosh() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void sinh() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void tanh() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void abs() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void exp() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void ln() throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void log10() throw(INTERP_KERNEL::Exception);
     //
-    Value *plus(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *minus(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *mult(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *div(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *pow(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *max(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *min(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *greaterThan(const Value *other) const throw(INTERP_KERNEL::Exception);
-    Value *lowerThan(const Value *other) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *plus(const Value *other) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *minus(const Value *other) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *mult(const Value *other) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *div(const Value *other) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *pow(const Value *other) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *max(const Value *other) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *min(const Value *other) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *greaterThan(const Value *other) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *lowerThan(const Value *other) const throw(INTERP_KERNEL::Exception);
     //
-    Value *ifFunc(const Value *the, const Value *els) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT Value *ifFunc(const Value *the, const Value *els) const throw(INTERP_KERNEL::Exception);
   private:
     ValueUnit(const DecompositionInUnitBase& unit);
     static void unsupportedOp(const char *type) throw(INTERP_KERNEL::Exception);