Changeset 476


Ignore:
Timestamp:
Dec 22, 2010 9:45:51 AM (9 years ago)
Author:
stefan
Message:

include CouenneConfig?.h, so we get COIN_HAS_ASL and COIN_HAS_CPX defined; move asl includes behind others because it does bad things

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/BonCouenneSetup.cpp

    r469 r476  
    1212// Ampl includes
    1313
    14 #ifdef COIN_HAS_ASL
    15 #include "asl.h"
    16 #include "getstub.h"
    17 #endif
     14#include "CouenneConfig.h"
    1815
    1916#include "OsiClpSolverInterface.hpp"
     
    6158#include "BonCbc.hpp"
    6259
     60// ASL includes need to come behind OsiClp and Bonmin, because it defines "filename",
     61// which is used as variablename in Clp
     62// (similar bad as windows.h, which defines "small")
     63#ifdef COIN_HAS_ASL
     64#include "asl.h"
     65#include "getstub.h"
     66#endif
    6367
    6468using namespace Couenne;
Note: See TracChangeset for help on using the changeset viewer.