Changeset 946 for stable/0.4/Couenne/src/bound_tightening/FixPointGenCuts.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/bound_tightening (modified) (1 prop)
• src/bound_tightening/FixPointGenCuts.cpp (modified) (1 diff)

stable/0.4/Couenne/src/bound_tightening/FixPointGenCuts.cpp

@@ -28 +28 @@
 void CouenneFixPoint::generateCuts (const OsiSolverInterface &si,
                                     OsiCuts &cs,
-                                    const CglTreeInfo treeInfo) const {
+                                    const CglTreeInfo treeInfo)
+#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
+  const
+#endif
+  {
 
   /// Only run this if the latest FBBT terminated on the iteration