Changeset 946 for stable/0.4/Couenne/src/cut/crossconv/CrossConvGenCuts.cpp

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/cut/crossconv/CrossConvGenCuts.cpp (modified) (1 diff)

stable/0.4/Couenne/src/cut/crossconv/CrossConvGenCuts.cpp

@@ -17 +17 @@
 void CouenneCrossConv::generateCuts (const OsiSolverInterface &, 
                                      OsiCuts &, 
-                                     const CglTreeInfo) const {
+                                     const CglTreeInfo)
+#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
+   const
+#endif
+{
 
 }