X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNEL%2FExprEval%2FInterpKernelUnit.hxx;h=84daa5d92be77440f10f2ec48ecf286b78bd3d5a;hb=bc8e0ec7fd1942e0650878116f5093c1abb6a72c;hp=5d6f650075699547a9209716af54ccad5a9ac910;hpb=d75af918c8c1b27341e612d7591580d958080cd4;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.hxx index 5d6f65007..84daa5d92 100644 --- 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-2014 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: @@ -70,7 +69,7 @@ namespace INTERP_KERNEL 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);