Skip to content

Commit

Permalink
Fixing compilation problems under mingw
Browse files Browse the repository at this point in the history
  • Loading branch information
Gilles Chabert committed Mar 1, 2019
1 parent 06b415c commit b34e0fb
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 16 deletions.
4 changes: 2 additions & 2 deletions plugins/optim/src/data/ibex_CovOptimData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class CovOptimData : public CovList {
/**
* \brief Display the format of a CovOptimData file.
*/
static string format();
static std::string format();

/**
* \brief COVOptimData file format version.
Expand Down Expand Up @@ -161,7 +161,7 @@ class CovOptimData : public CovList {
*/
static std::ofstream* write(const char* filename, const CovOptimData& cov, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

static void format(std::stringstream& ss, const string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);
static void format(std::stringstream& ss, const std::string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

/* read the variable names */
static void read_vars(std::ifstream& f, size_t n, std::vector<std::string>& var_names);
Expand Down
4 changes: 2 additions & 2 deletions plugins/solver/src/ibex_CovSolverData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class CovSolverData : public CovManifold {
/**
* \brief Display the format of a CovSolverData file.
*/
static string format();
static std::string format();

/**
* \brief COVSolverData file format version.
Expand All @@ -219,7 +219,7 @@ class CovSolverData : public CovManifold {
*/
static std::ofstream* write(const char* filename, const CovSolverData& cov, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

static void format(std::stringstream& ss, const string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);
static void format(std::stringstream& ss, const std::string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

/* read the variable names */
static void read_vars(std::ifstream& f, size_t n, std::vector<std::string>& var_names);
Expand Down
2 changes: 2 additions & 0 deletions plugins/solver/src/ibex_DefaultSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ using namespace std;

namespace ibex {

double DefaultSolver::default_eps_x_max = POS_INFINITY;

#define SQUARE_EQ_SYSTEM_TAG 1

namespace {
Expand Down
8 changes: 6 additions & 2 deletions plugins/solver/src/ibex_DefaultSolver.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ class DefaultSolver : private Memory, public Solver {
/**
* \brief Default maximal width: +oo.
*/
static constexpr double default_eps_x_max = POS_INFINITY;


// TODO: constexpr definition not possible with FILIB (POS_INFINITY is not
// a constexpr with FILIB).
//static constexpr double default_eps_x_max = POS_INFINITY;
static double default_eps_x_max;

/**
* Default random seed: 1.0.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/data/ibex_Cov.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Cov {
/**
* \brief Display the COV file format.
*/
static string format();
static std::string format();

/**
* \brief COV file format version.
Expand Down Expand Up @@ -89,7 +89,7 @@ class Cov {
*/
static std::ofstream* write(const char* filename, const Cov& cov, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

static void format(std::stringstream& ss, const string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);
static void format(std::stringstream& ss, const std::string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

static void read_signature(std::ifstream& f);

Expand Down
4 changes: 2 additions & 2 deletions src/data/ibex_CovIBUList.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class CovIBUList : public CovIUList {
/**
* \brief Display the format of a CovIBUList file.
*/
static string format();
static std::string format();

/**
* \brief COVIBUList file format version.
Expand Down Expand Up @@ -159,7 +159,7 @@ class CovIBUList : public CovIUList {
*/
static std::ofstream* write(const char* filename, const CovIBUList& cov, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

static void format(std::stringstream& ss, const string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);
static void format(std::stringstream& ss, const std::string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

/**
* \brief Subformat level.
Expand Down
4 changes: 2 additions & 2 deletions src/data/ibex_CovIUList.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class CovIUList : public CovList {
/**
* \brief Display the format of a CovIUList file.
*/
static string format();
static std::string format();

/**
* \brief COVIUList file format version.
Expand All @@ -139,7 +139,7 @@ class CovIUList : public CovList {
*/
static std::ofstream* write(const char* filename, const CovIUList& cov, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

static void format(std::stringstream& ss, const string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);
static void format(std::stringstream& ss, const std::string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

/**
* \brief Subformat level.
Expand Down
4 changes: 2 additions & 2 deletions src/data/ibex_CovList.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class CovList : public Cov {
/**
* \brief Display the format of a CovList file.
*/
static string format();
static std::string format();

/**
* \brief COVList file format version.
Expand All @@ -93,7 +93,7 @@ class CovList : public Cov {
*/
static std::ofstream* write(const char* filename, const CovList& cov, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

static void format(std::stringstream& ss, const string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);
static void format(std::stringstream& ss, const std::string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

static IntervalVector read_box(std::ifstream& f, size_t n);

Expand Down
4 changes: 2 additions & 2 deletions src/data/ibex_CovManifold.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class CovManifold : public CovIBUList {
/**
* \brief Display the format of a CovManifold file.
*/
static string format();
static std::string format();

/**
* \brief COVManifold file format version.
Expand All @@ -258,7 +258,7 @@ class CovManifold : public CovIBUList {
*/
static std::ofstream* write(const char* filename, const CovManifold& cov, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

static void format(std::stringstream& ss, const string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);
static void format(std::stringstream& ss, const std::string& title, std::stack<unsigned int>& format_id, std::stack<unsigned int>& format_version);

/* read parameters of the parametric proof */
static VarSet read_varset(std::ifstream& f, size_t n, size_t m);
Expand Down

0 comments on commit b34e0fb

Please sign in to comment.