diff --git a/include/Helmholtz.h b/include/Helmholtz.h
index 39b45bda..ca314a30 100644
--- a/include/Helmholtz.h
+++ b/include/Helmholtz.h
@@ -288,7 +288,7 @@ class BaseHelmholtzTerm
         return deriv.d4alphar_ddelta4;
     };
 
-    virtual void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw() = 0;
+    virtual void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) = 0;
     #if ENABLE_CATCH
     virtual mcx::MultiComplex<double> one_mcx(const mcx::MultiComplex<double>& tau, const mcx::MultiComplex<double>& delta) const {
         throw CoolProp::NotImplementedError("The mcx derivative function was not implemented");
@@ -513,7 +513,7 @@ class ResidualHelmholtzGeneralizedExponential : public BaseHelmholtzTerm
 
     void to_json(rapidjson::Value& el, rapidjson::Document& doc);
 
-    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw();
+    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) override;
     //void allEigen(const CoolPropDbl &tau, const CoolPropDbl &delta, HelmholtzDerivatives &derivs) throw();
 
     #if ENABLE_CATCH
@@ -558,7 +558,7 @@ class ResidualHelmholtzNonAnalytic : public BaseHelmholtzTerm
         }
     };
     void to_json(rapidjson::Value& el, rapidjson::Document& doc);
-    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw();
+    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) override;
 #if ENABLE_CATCH
     virtual mcx::MultiComplex<double> one_mcx(const mcx::MultiComplex<double>& tau, const mcx::MultiComplex<double>& delta) const override;
 #endif
@@ -608,7 +608,7 @@ class ResidualHelmholtzGaoB : public BaseHelmholtzTerm
     };
 
     void to_json(rapidjson::Value& el, rapidjson::Document& doc);
-    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw();
+    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) override;
 
     #if ENABLE_CATCH
         virtual mcx::MultiComplex<double> one_mcx(const mcx::MultiComplex<double>& tau, const mcx::MultiComplex<double>& delta) const override;
@@ -630,7 +630,7 @@ class ResidualHelmholtzXiangDeiters : public BaseHelmholtzTerm
     /// Constructor
     ResidualHelmholtzXiangDeiters(const CoolPropDbl Tc, const CoolPropDbl pc, const CoolPropDbl rhomolarc, const CoolPropDbl acentric,
                                   const CoolPropDbl R);
-    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw();
+    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) override;
 #if ENABLE_CATCH
     virtual mcx::MultiComplex<double> one_mcx(const mcx::MultiComplex<double>& tau, const mcx::MultiComplex<double>& delta) const override;
 #endif
@@ -1157,7 +1157,7 @@ class IdealHelmholtzCP0PolyT : public BaseHelmholtzTerm
     };
 
     void to_json(rapidjson::Value& el, rapidjson::Document& doc);
-    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw();
+    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) override;
 #if ENABLE_CATCH
     virtual mcx::MultiComplex<double> one_mcx(const mcx::MultiComplex<double>& tau, const mcx::MultiComplex<double>& delta) const override;
 #endif
@@ -1194,7 +1194,7 @@ class IdealHelmholtzGERG2004Sinh : public BaseHelmholtzTerm
     bool is_enabled() const {
         return enabled;
     };
-    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw();
+    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) override;
 
     #if ENABLE_CATCH
         virtual mcx::MultiComplex<double> one_mcx(const mcx::MultiComplex<double>& tau, const mcx::MultiComplex<double>& delta) const override;
@@ -1230,7 +1230,7 @@ class IdealHelmholtzGERG2004Cosh : public BaseHelmholtzTerm
     bool is_enabled() const {
         return enabled;
     };
-    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw();
+    void all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) override;
 
     #if ENABLE_CATCH
     virtual mcx::MultiComplex<double> one_mcx(const mcx::MultiComplex<double>& tau, const mcx::MultiComplex<double>& delta) const override;
diff --git a/src/Helmholtz.cpp b/src/Helmholtz.cpp
index 4309cf89..4ab2ee21 100644
--- a/src/Helmholtz.cpp
+++ b/src/Helmholtz.cpp
@@ -134,7 +134,7 @@ void ResidualHelmholtzGeneralizedExponential::allEigen(const CoolPropDbl &tau, c
     return;
 };
 */
-void ResidualHelmholtzGeneralizedExponential::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw() {
+void ResidualHelmholtzGeneralizedExponential::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) {
     CoolPropDbl log_tau = log(tau), log_delta = log(delta), ndteu, one_over_delta = 1 / delta,
                 one_over_tau = 1 / tau;  // division is much slower than multiplication, so do one division here
 
@@ -382,7 +382,7 @@ void ResidualHelmholtzNonAnalytic::to_json(rapidjson::Value& el, rapidjson::Docu
     el.AddMember("D", _D, doc.GetAllocator());
 }
 
-void ResidualHelmholtzNonAnalytic::all(const CoolPropDbl& tau_in, const CoolPropDbl& delta_in, HelmholtzDerivatives& derivs) throw() {
+void ResidualHelmholtzNonAnalytic::all(const CoolPropDbl& tau_in, const CoolPropDbl& delta_in, HelmholtzDerivatives& derivs) {
     if (N == 0) {
         return;
     }
@@ -662,7 +662,7 @@ display(sy.ccode(sy.simplify(sy.diff(Ftau, tau, 3)*tau**3)))
 display(sy.ccode(sy.simplify(sy.diff(Ftau, tau, 4)*tau**4)))
 
 */
-void ResidualHelmholtzGaoB::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw() {
+void ResidualHelmholtzGaoB::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) {
     if (!enabled) {
         return;
     }
@@ -798,7 +798,7 @@ ResidualHelmholtzXiangDeiters::ResidualHelmholtzXiangDeiters(const CoolPropDbl T
     enabled = true;
 };
 
-void ResidualHelmholtzXiangDeiters::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw() {
+void ResidualHelmholtzXiangDeiters::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) {
     if (!enabled) {
         return;
     }
@@ -1270,7 +1270,7 @@ void IdealHelmholtzCP0Constant::all(const CoolPropDbl& tau, const CoolPropDbl& d
     derivs.d3alphar_dtau3 += 2 * cp_over_R / (tau * tau * tau);
     derivs.d4alphar_dtau4 += -6 * cp_over_R / POW4(tau);
 }
-void IdealHelmholtzCP0PolyT::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw() {
+void IdealHelmholtzCP0PolyT::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) {
     if (!enabled) {
         return;
     }
@@ -1342,7 +1342,7 @@ void IdealHelmholtzCP0PolyT::all(const CoolPropDbl& tau, const CoolPropDbl& delt
     }
 }
 
-void IdealHelmholtzGERG2004Sinh::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw() {
+void IdealHelmholtzGERG2004Sinh::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) {
     if (!enabled) {
         return;
     }
@@ -1394,7 +1394,7 @@ mcx::MultiComplex<double> IdealHelmholtzGERG2004Sinh::one_mcx(const mcx::MultiCo
 }
 #endif
 
-void IdealHelmholtzGERG2004Cosh::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) throw() {
+void IdealHelmholtzGERG2004Cosh::all(const CoolPropDbl& tau, const CoolPropDbl& delta, HelmholtzDerivatives& derivs) {
     if (!enabled) {
         return;
     }