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/disjunctive/CouenneDisjCuts.hpp

    r490 r946  
    1515
    1616#include "OsiSolverInterface.hpp"
     17#include "CglConfig.h"
    1718#include "CglCutGenerator.hpp"
    1819#include "BonOsiTMINLPInterface.hpp"
     
    118119  void generateCuts (const OsiSolverInterface &,
    119120                     OsiCuts &,
    120                      const CglTreeInfo = CglTreeInfo ()) const;
     121                     const CglTreeInfo = CglTreeInfo ())
     122#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     123  const
     124#endif
     125  ;
    121126
    122127  /// Add list of options to be read from file
Note: See TracChangeset for help on using the changeset viewer.