1.1 --- a/lemon/lp.h	Thu Apr 02 14:07:38 2015 +0200
     1.2 +++ b/lemon/lp.h	Tue Apr 28 18:07:07 2015 +0200
     1.3 @@ -22,19 +22,19 @@
     1.4  #include<lemon/config.h>
     1.5  
     1.6  
     1.7 -#if LEMON_DEFAULT_LP == _LEMON_GLPK || LEMON_DEFAULT_MIP == _LEMON_GLPK
     1.8 +#if LEMON_DEFAULT_LP == LEMON_GLPK_ || LEMON_DEFAULT_MIP == LEMON_GLPK_
     1.9  #include <lemon/glpk.h>
    1.10  #endif
    1.11 -#if LEMON_DEFAULT_LP == _LEMON_CPLEX || LEMON_DEFAULT_MIP == _LEMON_CPLEX 
    1.12 +#if LEMON_DEFAULT_LP == LEMON_CPLEX_ || LEMON_DEFAULT_MIP == LEMON_CPLEX_
    1.13  #include <lemon/cplex.h>
    1.14  #endif
    1.15 -#if LEMON_DEFAULT_LP == _LEMON_SOPLEX
    1.16 +#if LEMON_DEFAULT_LP == LEMON_SOPLEX_
    1.17  #include <lemon/soplex.h>
    1.18  #endif
    1.19 -#if LEMON_DEFAULT_LP == _LEMON_CLP
    1.20 +#if LEMON_DEFAULT_LP == LEMON_CLP_
    1.21  #include <lemon/clp.h>
    1.22  #endif
    1.23 -#if LEMON_DEFAULT_MIP == _LEMON_CBC
    1.24 +#if LEMON_DEFAULT_MIP == LEMON_CBC_
    1.25  #include <lemon/cbc.h>
    1.26  #endif
    1.27  
    1.28 @@ -49,8 +49,8 @@
    1.29    ///The default LP solver identifier.
    1.30    ///\ingroup lp_group
    1.31    ///
    1.32 -  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX,
    1.33 -  ///\c _LEMON_SOPLEX or \c LEMON__CLP
    1.34 +  ///Currently, the possible values are \c LEMON_GLPK_, \c LEMON_CPLEX_,
    1.35 +  ///\c LEMON_SOPLEX_ or \c LEMON_CLP_
    1.36  #define LEMON_DEFAULT_LP SOLVER
    1.37    ///The default LP solver
    1.38  
    1.39 @@ -65,8 +65,8 @@
    1.40    ///The default MIP solver identifier.
    1.41    ///\ingroup lp_group
    1.42    ///
    1.43 -  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX
    1.44 -  ///or \c _LEMON_CBC
    1.45 +  ///Currently, the possible values are \c LEMON_GLPK_, \c LEMON_CPLEX_
    1.46 +  ///or \c LEMON_CBC_
    1.47  #define LEMON_DEFAULT_MIP SOLVER
    1.48    ///The default MIP solver.
    1.49  
    1.50 @@ -76,20 +76,20 @@
    1.51    ///Currently, it is either \c GlpkMip, \c CplexMip , \c CbcMip
    1.52    typedef GlpkMip Mip;
    1.53  #else
    1.54 -#if LEMON_DEFAULT_LP == _LEMON_GLPK
    1.55 +#if LEMON_DEFAULT_LP == LEMON_GLPK_
    1.56    typedef GlpkLp Lp;
    1.57 -#elif LEMON_DEFAULT_LP == _LEMON_CPLEX
    1.58 +#elif LEMON_DEFAULT_LP == LEMON_CPLEX_
    1.59    typedef CplexLp Lp;
    1.60 -#elif LEMON_DEFAULT_LP == _LEMON_SOPLEX
    1.61 +#elif LEMON_DEFAULT_LP == LEMON_SOPLEX_
    1.62    typedef SoplexLp Lp;
    1.63 -#elif LEMON_DEFAULT_LP == _LEMON_CLP
    1.64 +#elif LEMON_DEFAULT_LP == LEMON_CLP_
    1.65    typedef ClpLp Lp;
    1.66  #endif
    1.67 -#if LEMON_DEFAULT_MIP == _LEMON_GLPK
    1.68 +#if LEMON_DEFAULT_MIP == LEMON_GLPK_
    1.69    typedef GlpkMip Mip;
    1.70 -#elif LEMON_DEFAULT_MIP == _LEMON_CPLEX
    1.71 +#elif LEMON_DEFAULT_MIP == LEMON_CPLEX_
    1.72    typedef CplexMip Mip;
    1.73 -#elif LEMON_DEFAULT_MIP == _LEMON_CBC
    1.74 +#elif LEMON_DEFAULT_MIP == LEMON_CBC_
    1.75    typedef CbcMip Mip;
    1.76  #endif
    1.77  #endif