|
| 1 | +From 6dbf7f07d5c9e1f3afe793f782d191d4465088ae Mon Sep 17 00:00:00 2001 |
| 2 | +From: Matthias Koeppe < [email protected]> |
| 3 | +Date: Thu, 7 Jul 2022 15:42:35 -0700 |
| 4 | +Subject: [PATCH] Remove dynamic exception specifications to conform to ISO |
| 5 | + C++17 |
| 6 | + |
| 7 | +--- |
| 8 | + code/latte/ExponentialSubst.cpp | 2 -- |
| 9 | + code/latte/ExponentialSubst.h | 6 ++---- |
| 10 | + code/latte/sqlite/IntegrationDB.cpp | 2 +- |
| 11 | + code/latte/sqlite/IntegrationDB.h | 2 +- |
| 12 | + 4 files changed, 4 insertions(+), 8 deletions(-) |
| 13 | + |
| 14 | +diff --git a/code/latte/ExponentialSubst.cpp b/code/latte/ExponentialSubst.cpp |
| 15 | +index a839b820..bcbfa934 100644 |
| 16 | +--- a/code/latte/ExponentialSubst.cpp |
| 17 | ++++ b/code/latte/ExponentialSubst.cpp |
| 18 | +@@ -57,7 +57,6 @@ mpq_vector |
| 19 | + computeExponentialResidueWeights(const vec_ZZ &generic_vector, |
| 20 | + mpz_class &prod_ray_scalar_products, |
| 21 | + const listCone *cone, int numOfVars) |
| 22 | +- throw(NotGenericException) |
| 23 | + { |
| 24 | + // Compute dimension; can be smaller than numOfVars |
| 25 | + int dimension = 0; |
| 26 | +@@ -95,7 +94,6 @@ computeExponentialResidueWeights(const vec_ZZ &generic_vector, |
| 27 | + mpq_vector |
| 28 | + computeExponentialResidueWeights(const vec_ZZ &generic_vector, |
| 29 | + const listCone *cone, int numOfVars) |
| 30 | +- throw(NotGenericException) |
| 31 | + { |
| 32 | + mpz_class prod_ray_scalar_products; |
| 33 | + return computeExponentialResidueWeights(generic_vector, |
| 34 | +diff --git a/code/latte/ExponentialSubst.h b/code/latte/ExponentialSubst.h |
| 35 | +index c9fa4ace..43a4ab63 100644 |
| 36 | +--- a/code/latte/ExponentialSubst.h |
| 37 | ++++ b/code/latte/ExponentialSubst.h |
| 38 | +@@ -58,13 +58,11 @@ class Exponential_Single_Cone_Parameters |
| 39 | + mpq_vector /* FIXME: This version can probably go away */ |
| 40 | + computeExponentialResidueWeights(const vec_ZZ &generic_vector, |
| 41 | + mpz_class &prod_ray_scalar_products, |
| 42 | +- const listCone *cone, int numOfVars) |
| 43 | +- throw(NotGenericException); |
| 44 | ++ const listCone *cone, int numOfVars); |
| 45 | + |
| 46 | + mpq_vector |
| 47 | + computeExponentialResidueWeights(const vec_ZZ &generic_vector, |
| 48 | +- const listCone *cone, int numOfVars) |
| 49 | +- throw(NotGenericException); |
| 50 | ++ const listCone *cone, int numOfVars); |
| 51 | + |
| 52 | + ZZ |
| 53 | + scalar_power(const vec_ZZ &generic_vector, |
| 54 | +diff --git a/code/latte/sqlite/IntegrationDB.cpp b/code/latte/sqlite/IntegrationDB.cpp |
| 55 | +index ab8df535..c1dde830 100644 |
| 56 | +--- a/code/latte/sqlite/IntegrationDB.cpp |
| 57 | ++++ b/code/latte/sqlite/IntegrationDB.cpp |
| 58 | +@@ -1277,7 +1277,7 @@ void IntegrationDB::insertSpecficPolytopeIntegrationTest(string polymakeFile, i |
| 59 | + * @parm filePath: to the latte-style polynomial. |
| 60 | + * @return rowid of the inserted row. |
| 61 | + */ |
| 62 | +-int IntegrationDB::insertPolynomial(int dim, int degree, const char*filePath) throw(SqliteDBexception) |
| 63 | ++int IntegrationDB::insertPolynomial(int dim, int degree, const char*filePath) |
| 64 | + { |
| 65 | + if ( doesPolynomialExist(filePath)) |
| 66 | + throw SqliteDBexception(string("insertPolynomial::Polynomial ")+filePath+" already exist"); |
| 67 | +diff --git a/code/latte/sqlite/IntegrationDB.h b/code/latte/sqlite/IntegrationDB.h |
| 68 | +index d690a832..ce8cfac6 100644 |
| 69 | +--- a/code/latte/sqlite/IntegrationDB.h |
| 70 | ++++ b/code/latte/sqlite/IntegrationDB.h |
| 71 | +@@ -67,7 +67,7 @@ class IntegrationDB: public SqliteDB |
| 72 | + int insertIntegrationTest(int polynomialID, int polytopeID); |
| 73 | + void insertIntegrationTest(int dim, int degree, int vertexCount, int count); |
| 74 | + void insertSpecficPolytopeIntegrationTest(string polymakeFile, int degree, int count); |
| 75 | +- int insertPolynomial(int dim, int degree, const char*filePath) throw(SqliteDBexception); |
| 76 | ++ int insertPolynomial(int dim, int degree, const char*filePath); |
| 77 | + |
| 78 | + int insertPolytope(int dim, int vertexCount, int simple, int dualRowID, const char* latteFilePath, const char* polymakeFilePath); |
| 79 | + |
0 commit comments