1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
|
Description: avoid exception specifications, removed in C++17
Author: Pierre Gruet <pgt@debian.org>
Bug-Debian: https://bugs.debian.org/984107
Forwarded: lkajan@rostlab.org
Last-Update: 2021-10-12
--- a/lib/freecontact.cpp
+++ b/lib/freecontact.cpp
@@ -237,7 +237,7 @@
freq_vec_t &__aliw, double &__wtot,
const ali_t& __ali, double __cp,
bool __veczw, int __num_threads
- ) throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error)
+ ) //throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error)
{
if (__ali.seqcnt < 2) throw alilen_error(bo::str(bo::format("alignment size (%d) < 2") % __ali.seqcnt));
// lkajan: the present implementation is limited to alilen 4080.
@@ -436,7 +436,7 @@
double __pseudocnt, double __pscnt_weight, bool __estimate_ivcov, double __shrink_lambda,
bool __cov20, bool __apply_gapth, double __rho,
int __num_threads, time_t __icme_timeout, time_res_t *__timing
- ) throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error)
+ ) //throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error)
{
if (__ali.seqcnt < 2) throw alilen_error(bo::str(bo::format("alignment size (%d) < 2") % __ali.seqcnt));
if (__ali.seqcnt != __aliw.size()) throw alilen_error(bo::str(bo::format("alignment size (%d) != alignment weight vector size (%d)") % __ali.seqcnt % __aliw.size()));
@@ -973,7 +973,7 @@
double __pseudocnt, double __pscnt_weight, bool __estimate_ivcov, double __shrink_lambda,
bool __cov20, bool __apply_gapth, double __rho,
bool __veczw, int __num_threads, time_t __icme_timeout, time_res_t *__timing
- ) throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error)
+ ) //throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error)
{
timeval t_top; gettimeofday(&t_top, NULL);
timeval t_before; gettimeofday(&t_before, NULL);
@@ -998,7 +998,7 @@
}
-ali_t& ali_t::push(const std::vector<uint8_t>& __al) throw (alilen_error)
+ali_t& ali_t::push(const std::vector<uint8_t>& __al) //throw (alilen_error)
{
if( __al.size() != alilen ) throw alilen_error(bo::str(bo::format("alignment length mismatch, expected %d, got %d") % alilen % __al.size() ));
resize( ++seqcnt*alilen16, _mm_setzero_si128() );
--- a/lib/freecontact.h
+++ b/lib/freecontact.h
@@ -110,10 +110,10 @@
}
/// Push a sequence to the alignment.
- ali_t& push(const std::vector<uint8_t>& __al) throw (alilen_error);
+ ali_t& push(const std::vector<uint8_t>& __al);// throw (alilen_error);
/// Push a sequence to the alignment.
- inline ali_t& push(const std::string& __l) throw (alilen_error)
+ inline ali_t& push(const std::string& __l) //throw (alilen_error)
{
return push(read_a_seq(__l));
}
@@ -182,7 +182,7 @@
freq_vec_t &__aliw, double &__wtot,
const ali_t& __ali, double __clustpc,
bool __veczw = true, int __num_threads = 0
- ) throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error);
+ );// throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error);
/// Predict residue contacts.
/** \param [in] __ali Input alignment.
@@ -216,7 +216,7 @@
double __pseudocnt, double __pscnt_weight, bool __estimate_ivcov, double __shrink_lambda,
bool __cov20, bool __apply_gapth, double __rho,
int __num_threads = 0, time_t __icme_timeout = 1800, time_res_t *__timing = NULL
- ) throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error);
+ );// throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error);
/// Predict residue contacts.
cont_res_t run(const ali_t& __ali, double __clustpc,
@@ -224,14 +224,14 @@
double __pseudocnt, double __pscnt_weight, bool __estimate_ivcov, double __shrink_lambda,
bool __cov20, bool __apply_gapth, double __rho,
bool __veczw = true, int __num_threads = 0, time_t __icme_timeout = 1800, time_res_t *__timing = NULL
- ) throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error);
+ );// throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error);
/// Predict residue contacts.
inline
cont_res_t run(const ali_t& __ali,
const parset_t& __parset,
bool __veczw = true, int __num_threads = 0, time_t __icme_timeout = 1800, time_res_t *__timing = NULL
- ) throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error)
+ )// throw (alilen_error, icme_timeout_error, std::range_error, std::runtime_error)
{
return run(__ali, __parset.clustpc,
__parset.density, __parset.gapth, __parset.mincontsep,
|