1.1 --- a/lemon/lp_soplex.cc	Fri Mar 02 17:56:22 2007 +0000
     1.2 +++ b/lemon/lp_soplex.cc	Fri Mar 02 18:04:28 2007 +0000
     1.3 @@ -44,15 +44,15 @@
     1.4  
     1.5    LpSolverBase &LpSoplex::_copyLp() {
     1.6      LpSoplex* newlp = new LpSoplex();
     1.7 -    ((soplex::SPxLP&)*(newlp->soplex)) = *soplex;
     1.8 +    (*static_cast<soplex::SPxLP*>(newlp->soplex)) = *soplex;
     1.9      return *newlp;
    1.10    }
    1.11  
    1.12    int LpSoplex::_addCol() {
    1.13 -    soplex::LPCol col;
    1.14 -    col.setLower(-soplex::infinity);
    1.15 -    col.setUpper(soplex::infinity);
    1.16 -    soplex->addCol(col);
    1.17 +    soplex::LPCol c;
    1.18 +    c.setLower(-soplex::infinity);
    1.19 +    c.setUpper(soplex::infinity);
    1.20 +    soplex->addCol(c);
    1.21  
    1.22      colNames.push_back(std::string());
    1.23      primal_value.push_back(0.0);
    1.24 @@ -62,10 +62,10 @@
    1.25    }
    1.26  
    1.27    int LpSoplex::_addRow() {
    1.28 -    soplex::LPRow row;
    1.29 -    row.setLhs(-soplex::infinity);
    1.30 -    row.setRhs(soplex::infinity);
    1.31 -    soplex->addRow(row);
    1.32 +    soplex::LPRow r;
    1.33 +    r.setLhs(-soplex::infinity);
    1.34 +    r.setRhs(soplex::infinity);
    1.35 +    soplex->addRow(r);
    1.36  
    1.37      dual_value.push_back(0.0);
    1.38      solved = false;
    1.39 @@ -92,15 +92,15 @@
    1.40      solved = false;
    1.41    }
    1.42    
    1.43 -  void LpSoplex::_getColName(int col, std::string &name) const {
    1.44 -    name = colNames[col]; 
    1.45 +  void LpSoplex::_getColName(int c, std::string &name) const {
    1.46 +    name = colNames[c]; 
    1.47    }
    1.48    
    1.49 -  void LpSoplex::_setColName(int col, const std::string &name) {
    1.50 -    invColNames.erase(colNames[col]);
    1.51 -    colNames[col] = name; 
    1.52 +  void LpSoplex::_setColName(int c, const std::string &name) {
    1.53 +    invColNames.erase(colNames[c]);
    1.54 +    colNames[c] = name; 
    1.55      if (!name.empty()) {
    1.56 -      invColNames.insert(std::make_pair(name, col));
    1.57 +      invColNames.insert(std::make_pair(name, c));
    1.58      }
    1.59    }
    1.60