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/cut/crossconv/CouenneCrossConv.hpp

    r605 r946  
    1414#include "BonRegisteredOptions.hpp"
    1515
     16#include "CglConfig.h"
    1617#include "CglCutGenerator.hpp"
    1718#include "OsiRowCut.hpp"
     
    158159    virtual void generateCuts (const OsiSolverInterface &,
    159160                       OsiCuts &,
    160                        const CglTreeInfo = CglTreeInfo ()) const;
     161                       const CglTreeInfo = CglTreeInfo ())
     162#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     163    const
     164#endif
     165    ;
    161166
    162167    /// Add list of options to be read from file
Note: See TracChangeset for help on using the changeset viewer.