Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne

  • stable/0.4/Couenne/src

  • stable/0.4/Couenne/src/convex/generateCuts.cpp

    r808 r946  
    9292void CouenneCutGenerator::generateCuts (const OsiSolverInterface &si,
    9393                                        OsiCuts &cs,
    94                                         const CglTreeInfo info) const {
     94                                        const CglTreeInfo info)
     95#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     96  const
     97#endif
     98  {
    9599
    96100  // check if out of time or if an infeasibility cut (iis of type 0)
Note: See TracChangeset for help on using the changeset viewer.