Changeset 946 for stable/0.4/Couenne/src/disjunctive/CouenneDisjCuts.hpp

Timestamp:

Apr 15, 2013 6:20:38 PM (8 years ago)

Author:

stefan

Message:

merge r945 from trunk: allow compiling against Cgl 0.58

Location:

stable/0.4/Couenne

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/disjunctive/CouenneDisjCuts.hpp (modified) (2 diffs)

stable/0.4/Couenne/src/disjunctive/CouenneDisjCuts.hpp

@@ -15 +15 @@
 
 #include "OsiSolverInterface.hpp"
+#include "CglConfig.h"
 #include "CglCutGenerator.hpp"
 #include "BonOsiTMINLPInterface.hpp"
@@ -118 +119 @@
   void generateCuts (const OsiSolverInterface &, 
                      OsiCuts &, 
-                     const CglTreeInfo = CglTreeInfo ()) const;
+                     const CglTreeInfo = CglTreeInfo ())
+#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
+  const
+#endif
+  ;
 
   /// Add list of options to be read from file