From a7ac45780ca942c6de8ce700462d8cfd9e80c88a Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Fri, 15 Aug 2014 01:35:31 +0200
Subject: [PATCH] [ML] Replace deprecated throw() with noexcept.
---
MathLib/LinAlg/Dense/DenseMatrix-impl.h | 16 ++++++++--------
MathLib/LinAlg/Dense/DenseMatrix.h | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/MathLib/LinAlg/Dense/DenseMatrix-impl.h b/MathLib/LinAlg/Dense/DenseMatrix-impl.h
index 0d871635b05..725f8a81aed 100644
--- a/MathLib/LinAlg/Dense/DenseMatrix-impl.h
+++ b/MathLib/LinAlg/Dense/DenseMatrix-impl.h
@@ -56,7 +56,7 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::~DenseMatrix ()
template <typename FP_TYPE, typename IDX_TYPE>
DenseMatrix<FP_TYPE, IDX_TYPE>&
DenseMatrix<FP_TYPE, IDX_TYPE>::operator=(DenseMatrix<FP_TYPE, IDX_TYPE> const& rhs)
- throw (std::range_error)
+ noexcept(false)
{
if (this == &rhs)
return *this;
@@ -140,7 +140,7 @@ V DenseMatrix<FP_TYPE, IDX_TYPE>::operator* (V const& x) const
template<typename FP_TYPE, typename IDX_TYPE>
DenseMatrix<FP_TYPE, IDX_TYPE>*
DenseMatrix<FP_TYPE, IDX_TYPE>::operator+(const DenseMatrix<FP_TYPE, IDX_TYPE>& mat) const
- throw (std::range_error)
+ noexcept(false)
{
// make sure the two matrices have the same dimension.
if (_n_rows != mat.getNRows() || _n_cols != mat.getNCols())
@@ -159,7 +159,7 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::operator+(const DenseMatrix<FP_TYPE, IDX_TYPE>&
template<typename FP_TYPE, typename IDX_TYPE>
DenseMatrix<FP_TYPE, IDX_TYPE>*
DenseMatrix<FP_TYPE, IDX_TYPE>::operator-(const DenseMatrix<FP_TYPE, IDX_TYPE>& mat) const
- throw (std::range_error)
+ noexcept(false)
{
// make sure the two matrices have the same dimension.
if (_n_rows != mat.getNRows() || _n_cols != mat.getNCols())
@@ -178,7 +178,7 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::operator-(const DenseMatrix<FP_TYPE, IDX_TYPE>&
template<typename FP_TYPE, typename IDX_TYPE>
DenseMatrix<FP_TYPE, IDX_TYPE>*
DenseMatrix<FP_TYPE, IDX_TYPE>::operator*(const DenseMatrix<FP_TYPE, IDX_TYPE>& mat) const
- throw (std::range_error)
+ noexcept(false)
{
// make sure the two matrices have the same dimension.
if (_n_cols != mat.getNRows())
@@ -218,7 +218,7 @@ DenseMatrix<FP_TYPE, IDX_TYPE>*
DenseMatrix<FP_TYPE, IDX_TYPE>::getSubMatrix(
IDX_TYPE b_row, IDX_TYPE b_col,
IDX_TYPE e_row, IDX_TYPE e_col) const
- throw (std::range_error)
+ noexcept(false)
{
if (b_row >= e_row | b_col >= e_col)
throw std::range_error("DenseMatrix::getSubMatrix() illegal sub matrix");
@@ -239,7 +239,7 @@ template<typename FP_TYPE, typename IDX_TYPE>
void
DenseMatrix<FP_TYPE, IDX_TYPE>::setSubMatrix(IDX_TYPE b_row, IDX_TYPE b_col,
const DenseMatrix<FP_TYPE, IDX_TYPE>& sub_mat)
- throw (std::range_error)
+ noexcept(false)
{
if (b_row + sub_mat.getNRows() > _n_rows | b_col + sub_mat.getNCols() > _n_cols)
throw std::range_error("DenseMatrix::setSubMatrix() sub matrix to big");
@@ -254,7 +254,7 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::setSubMatrix(IDX_TYPE b_row, IDX_TYPE b_col,
template<typename FP_TYPE, typename IDX_TYPE>
FP_TYPE&
DenseMatrix<FP_TYPE, IDX_TYPE>::operator() (IDX_TYPE row, IDX_TYPE col)
- throw (std::range_error)
+ noexcept(false)
{
if ((row >= _n_rows) | (col >= _n_cols))
throw std::range_error("DenseMatrix: op() const range error");
@@ -265,7 +265,7 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::operator() (IDX_TYPE row, IDX_TYPE col)
template<typename FP_TYPE, typename IDX_TYPE>
FP_TYPE const&
DenseMatrix<FP_TYPE, IDX_TYPE>::operator() (IDX_TYPE row, IDX_TYPE col) const
- throw (std::range_error)
+ noexcept(false)
{
if ((row >= _n_rows) | (col >= _n_cols))
throw std::range_error("DenseMatrix: op() const range error");
diff --git a/MathLib/LinAlg/Dense/DenseMatrix.h b/MathLib/LinAlg/Dense/DenseMatrix.h
index 7ab8a409636..b98e3568c4d 100644
--- a/MathLib/LinAlg/Dense/DenseMatrix.h
+++ b/MathLib/LinAlg/Dense/DenseMatrix.h
@@ -64,7 +64,7 @@ public:
* Assignment operator, makes a copy of the internal data of the object.
* @param rhs The DenseMatrix object to the right side of the assignment symbol.
*/
- DenseMatrix& operator=(DenseMatrix const& rhs) throw (std::range_error);
+ DenseMatrix& operator=(DenseMatrix const& rhs) noexcept(false);
/**
* This is the move assignment operator.
@@ -88,18 +88,18 @@ public:
/**
* DenseMatrix matrix addition.
*/
- DenseMatrix* operator+ (const DenseMatrix& mat) const throw (std::range_error);
+ DenseMatrix* operator+ (const DenseMatrix& mat) const noexcept(false);
/**
* DenseMatrix matrix subtraction
*/
- DenseMatrix* operator- (const DenseMatrix& mat) const throw (std::range_error);
+ DenseMatrix* operator- (const DenseMatrix& mat) const noexcept(false);
/**
* DenseMatrix matrix multiplication \f$ C = A \cdot B\f$
* @param mat the matrix \f$ B \f$
* @return the matrix \f$ C \f$
*/
- DenseMatrix* operator* (const DenseMatrix& mat) const throw (std::range_error);
+ DenseMatrix* operator* (const DenseMatrix& mat) const noexcept(false);
/**
* matrix transpose
@@ -107,7 +107,7 @@ public:
*/
DenseMatrix* transpose() const; // HB & ZC
- DenseMatrix* getSubMatrix (IDX_TYPE b_row, IDX_TYPE b_col, IDX_TYPE e_row, IDX_TYPE e_col) const throw (std::range_error);
+ DenseMatrix* getSubMatrix (IDX_TYPE b_row, IDX_TYPE b_col, IDX_TYPE e_row, IDX_TYPE e_col) const noexcept(false);
/**
* overwrites values of the matrix with the given sub matrix
@@ -115,10 +115,10 @@ public:
* @param b_col the first column
* @param sub_mat the sub matrix
*/
- void setSubMatrix (IDX_TYPE b_row, IDX_TYPE b_col, const DenseMatrix& sub_mat) throw (std::range_error);
+ void setSubMatrix (IDX_TYPE b_row, IDX_TYPE b_col, const DenseMatrix& sub_mat) noexcept(false);
- inline FP_TYPE & operator() (IDX_TYPE row, IDX_TYPE col) throw (std::range_error);
- inline FP_TYPE const& operator() (IDX_TYPE row, IDX_TYPE col) const throw (std::range_error);
+ inline FP_TYPE & operator() (IDX_TYPE row, IDX_TYPE col) noexcept(false);
+ inline FP_TYPE const& operator() (IDX_TYPE row, IDX_TYPE col) const noexcept(false);
/**
* writes the matrix entries into the output stream
--
GitLab