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

stable/0.4/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