1.1 --- a/lemon/lp_base.h	Thu Sep 14 19:58:29 2006 +0000
     1.2 +++ b/lemon/lp_base.h	Thu Sep 21 14:46:28 2006 +0000
     1.3 @@ -75,8 +75,10 @@
     1.4  	}
     1.5  	return cross[n];
     1.6        }
     1.7 -      ///\todo Create an own exception type.
     1.8 -      else throw LogicError(); //floatingId-s must form a continuous range;
     1.9 +      else {
    1.10 +	///\todo Create an own exception type.
    1.11 +	throw LogicError(); //floatingId-s must form a continuous range;
    1.12 +      }
    1.13      }
    1.14      ///Remove a fix id.
    1.15  
    1.16 @@ -1169,7 +1171,10 @@
    1.17        ///Continuous variable
    1.18        REAL = 0,
    1.19        ///Integer variable
    1.20 -      INTEGER = 1
    1.21 +
    1.22 +      ///Unfortunately, cplex 7.5 somewhere writes something like
    1.23 +      ///#define INTEGER 'I'
    1.24 +      LEMON_INTEGER = 1
    1.25        ///\todo No support for other types yet.
    1.26      };
    1.27  
    1.28 @@ -1192,7 +1197,7 @@
    1.29      ///Sets the type of the given Col to integer or remove that property.
    1.30      void integer(Col c, bool enable) {
    1.31        if (enable)
    1.32 -	colType(c,INTEGER);
    1.33 +	colType(c,LEMON_INTEGER);
    1.34        else
    1.35  	colType(c,REAL);
    1.36      }
    1.37 @@ -1202,7 +1207,7 @@
    1.38      ///Gives back the type of the column.
    1.39      ///\return true if the column has integer type and false if not.
    1.40      bool integer(Col c){
    1.41 -      return (colType(c)==INTEGER);
    1.42 +      return (colType(c)==LEMON_INTEGER);
    1.43      }
    1.44  
    1.45      /// The status of the MIP problem