Commit 1786b8fb authored by Martin Marinov's avatar Martin Marinov
Browse files

Merge branch 'ReForm-master' into merge-from-ReForm: This fixes build issues...

Merge branch 'ReForm-master' into merge-from-ReForm: This fixes build issues due to wrong merge-from-VCI of IPOTSolver.cc
parents 6d540e90 66450a47
Pipeline #904 passed with stage
This diff is collapsed.
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "IPOPTSolverLean.hh" #include "IPOPTSolverLean.hh"
#include "NProblemGmmInterface.hh" #include "NProblemGmmInterface.hh"
#include "NProblemInterface.hh" #include "NProblemInterface.hh"
#include "NProblemIPOPT.hh"
#include "NConstraintInterface.hh" #include "NConstraintInterface.hh"
#include "BoundConstraint.hh" #include "BoundConstraint.hh"
#include "CoMISo/Utils/CoMISoError.hh" #include "CoMISo/Utils/CoMISoError.hh"
...@@ -321,6 +320,6 @@ private: ...@@ -321,6 +320,6 @@ private:
//============================================================================= //=============================================================================
#endif // COMISO_IPOPTLEAN_AVAILABLE #endif // COMISO_IPOPTLEAN_AVAILABLE
//============================================================================= //=============================================================================
#endif // ACG_IPOPTSOLVER_HH defined #endif // COMISO_NPROBLEMIPOPT_HH
//============================================================================= //=============================================================================
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