Merge branch 'V9_2_2_BR'

[tools/medcoupling.git] / src / INTERP_KERNEL / ExprEval / InterpKernelUnit.hxx

diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
index c6d49935c8c816f108affc1a2e48eb162fbc42d4..54f9551aaac1674aca1e308b3871d3acd414dd49 100644 (file)
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,8 +33,7 @@ namespace INTERP_KERNEL
   {
   public:
     INTERPKERNEL_EXPORT UnitDataBase();
-    INTERPKERNEL_EXPORT const short *getInfoForUnit(const std::string& unit,
-                                                    double& addFact, double& mFact) const throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT const short *getInfoForUnit(const std::string& unit, double& addFact, double& mFact) const;
     INTERPKERNEL_EXPORT static UnitDataBase _uniqueMapForExpr;
     INTERPKERNEL_EXPORT static const int SIZE_OF_UNIT_BASE=5;
   private:
@@ -67,13 +66,13 @@ namespace INTERP_KERNEL
     //! \b WARNING no test is done on the fact that unit is adimensionnal.
     INTERPKERNEL_EXPORT void negate();
     INTERPKERNEL_EXPORT bool isAdimensional() const;
-    INTERPKERNEL_EXPORT void tryToConvertInUnit(double val) throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT void tryToConvertInUnit(double val);
     INTERPKERNEL_EXPORT DecompositionInUnitBase &operator*(const DecompositionInUnitBase& other);
     INTERPKERNEL_EXPORT DecompositionInUnitBase &operator/(const DecompositionInUnitBase& other);
-    INTERPKERNEL_EXPORT DecompositionInUnitBase &operator^(const DecompositionInUnitBase& other) throw(INTERP_KERNEL::Exception);
+    INTERPKERNEL_EXPORT DecompositionInUnitBase &operator^(const DecompositionInUnitBase& other);
   private:
     void dealWithAddFactor(const DecompositionInUnitBase& other);
-    static int couldItBeConsideredAsInt(double val) throw(INTERP_KERNEL::Exception);
+    static int couldItBeConsideredAsInt(double val);
     static bool areDoubleEquals(double a, double b);
     static double powInt(double val, int exp);
   private:
@@ -84,8 +83,8 @@ namespace INTERP_KERNEL
 
   /*!
    * This class deals with units.
-   * This class has two main responsabilities :
-   *      - interprete units by giving simply their representation in string type.
+   * This class has two main responsibilities :
+   *      - interpret units by giving simply their representation in string type.
    *      - performing operations on these units.
    *
    * All the possible units are represented with a unique tuple with 5 elements