Commit 9eb7213e authored by Max Lyon's avatar Max Lyon

Merge branch 'Fix_warnings-GF' into warning_fixes

# Conflicts:
#	.gitlab-ci.yml
#	Base
#	CMakeLists.txt
#	cmake/FindCGAL.cmake
parents 54dc54db bc3539da
......@@ -66,7 +66,7 @@ public:
sllt_.compute(mat_);
#if EIGEN_VERSION_AT_LEAST(3,1,0)
if ( !sllt_.info() != Eigen::Success )
if ( sllt_.info() != Eigen::Success )
#else
if ( !sllt_.succeeded() )
#endif
......
......@@ -33,7 +33,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class COMISODLLEXPORT AcceleratedQuadraticProxy
class AcceleratedQuadraticProxy
{
public:
......
......@@ -17,7 +17,9 @@
#include <CoMISo/Utils/CoMISoError.hh>
#include <Base/Debug/DebTime.hh>
#include <Base/Code/Quality.hh>
LOW_CODE_QUALITY_SECTION_BEGIN
// For Branch and bound
#include "OsiSolverInterface.hpp"
#include "CbcModel.hpp"
......@@ -44,6 +46,7 @@
// Heuristics
#include "CbcHeuristic.hpp"
#include "CbcCompareDepth.hpp"
LOW_CODE_QUALITY_SECTION_END
#include <stdexcept>
......
......@@ -27,7 +27,7 @@ namespace COMISO {
/// Default constructor
ConeConstraint::ConeConstraint()
: NConstraintInterface(NConstraintInterface::NC_GREATER_EQUAL),
i_(1), c_(1.0)
c_(1.0), i_(1)
{
Q_.clear();
}
......
......@@ -454,7 +454,7 @@ make_constraints_independent(
{
int cur_j = static_cast<int>(row_it.index());
// do not use the constant part
if( cur_j != n_vars - 1 )
if (cur_j != (int)n_vars - 1 )
{
// found real valued var? -> finished (UPDATE: no not any more, find biggest real value to avoid x/1e-13)
if( !roundmap[ cur_j ])
......@@ -668,7 +668,7 @@ make_constraints_independent_reordering(
{
int cur_j = static_cast<int>(row_it.index());
// do not use the constant part
if (cur_j != n_vars - 1)
if (cur_j != (int)n_vars - 1)
{
// found real valued var? -> finished (UPDATE: no not any more, find biggest real value to avoid x/1e-13)
if (!roundmap[ cur_j ])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment