Changeset 945 for trunk/Couenne/src/cut/crossconv/CouenneCrossConv.hpp

Timestamp:

Apr 6, 2013 4:25:21 PM (8 years ago)

Author:

stefan

Message:

generateCuts in Cgl >= 0.58 will not be const anymore

File:

• trunk/Couenne/src/cut/crossconv/CouenneCrossConv.hpp (modified) (2 diffs)

trunk/Couenne/src/cut/crossconv/CouenneCrossConv.hpp

@@ -14 +14 @@
 #include "BonRegisteredOptions.hpp"
 
+#include "CglConfig.h"
 #include "CglCutGenerator.hpp"
 #include "OsiRowCut.hpp"
@@ -158 +159 @@
     virtual 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