Changeset 945 for trunk/Couenne/src/convex/CouenneCutGenerator.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/convex/CouenneCutGenerator.hpp (modified) (2 diffs)

trunk/Couenne/src/convex/CouenneCutGenerator.hpp

@@ -15 +15 @@
 
 #include "BonOaDecBase.hpp"
+#include "CglConfig.h"
 #include "CglCutGenerator.hpp"
 #include "OsiRowCut.hpp"
@@ -155 +156 @@
   void generateCuts (const OsiSolverInterface &, 
                      OsiCuts &, 
-                     const CglTreeInfo = CglTreeInfo ()) const;
+                     const CglTreeInfo = CglTreeInfo ())
+#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
+   const
+#endif
+  ;
 
   /// create cut and check violation. Insert and return status