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/CouenneCutGenerator.hpp

    r772 r946  
    1515
    1616#include "BonOaDecBase.hpp"
     17#include "CglConfig.h"
    1718#include "CglCutGenerator.hpp"
    1819#include "OsiRowCut.hpp"
     
    155156  void generateCuts (const OsiSolverInterface &,
    156157                     OsiCuts &,
    157                      const CglTreeInfo = CglTreeInfo ()) const;
     158                     const CglTreeInfo = CglTreeInfo ())
     159#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     160   const
     161#endif
     162  ;
    158163
    159164  /// create cut and check violation. Insert and return status
Note: See TracChangeset for help on using the changeset viewer.