From 40c3e0035a668b255398907dd9352b05e37cb848 Mon Sep 17 00:00:00 2001 From: Antoine Marendet Date: Tue, 26 Mar 2019 11:41:54 +0100 Subject: [PATCH] [sip] Fix bug with static constexpr --- plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.cpp | 5 +++++ plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.cpp b/plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.cpp index 2e784ce7b..545d91f86 100644 --- a/plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.cpp +++ b/plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.cpp @@ -36,6 +36,11 @@ using namespace std; namespace ibex { +const double SIPOptimizer::default_rel_eps_f = 1e-3; +const double SIPOptimizer::default_abs_eps_f = 1e-3; +const double SIPOptimizer::default_lf_loop_ratio = 0.1; +const double SIPOptimizer::default_eps_x = 0; + SIPOptimizer::SIPOptimizer(int n, Ctc& ctc, Bsc& bisector, LoupFinder& loup_finder, LoupFinder& loup_finder2, CellBufferOptim& buffer, int goal_var, double eps_x, diff --git a/plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.h b/plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.h index 5da372eb9..18eb77572 100644 --- a/plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.h +++ b/plugins/sip/src/marendet/strategy/ibex_SIPOptimizer.h @@ -36,10 +36,10 @@ class SIPOptimizer { UNREACHED_PREC }; - static constexpr double default_rel_eps_f = 1e-3; - static constexpr double default_abs_eps_f = 1e-3; - static constexpr double default_lf_loop_ratio = 0.1; - static constexpr double default_eps_x = 0; + static const double default_rel_eps_f; + static const double default_abs_eps_f; + static const double default_lf_loop_ratio; + static const double default_eps_x; SIPOptimizer(int n, Ctc& ctc, Bsc& bisector, LoupFinder& loup_finder, LoupFinder& loup_finder2, CellBufferOptim& buffer, int goal_var,