Changeset 2591:3b4d5bc3b4fb in lemon-0.x for lemon

Timestamp:

03/01/08 21:09:40 (16 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3473

Message:

In C++98 array size shall be an integral constant expression. Fixes
ticket 12.

Location:

lemon

Files:

• lp_cplex.cc (modified) (2 diffs)
• lp_glpk.cc (modified) (1 diff)

lemon/lp_cplex.cc

@@ -92 +92 @@
 
     storespace *= -1;
-    char buf[storespace];
+    std::vector<char> buf(storespace);
     char *names[1];
     int dontcare;
     ///\bug return code unchecked for error
-    CPXgetcolname(env, lp, names, buf, storespace, &dontcare, col, col);
+    CPXgetcolname(env, lp, names, &*buf.begin(), storespace, &dontcare, col, col);
     name = names[0];
   }
@@ -403 +403 @@
   bool LpCplex::_isBasicCol(int i) const
   {
-    int cstat[CPXgetnumcols(env, lp)];
-    CPXgetbase(env, lp, cstat, NULL);
+    std::vector<int> cstat(CPXgetnumcols(env, lp));
+    CPXgetbase(env, lp, &*cstat.begin(), NULL);
     return (cstat[i]==CPX_BASIC);
   }  

lemon/lp_glpk.cc

@@ -65 +65 @@
     LEMON_glp(add_cols)(lp, LEMON_glp(get_num_cols)(glp.lp));
     int len;
-    int ind[1+LEMON_glp(get_num_cols)(glp.lp)];
-    Value val[1+LEMON_glp(get_num_cols)(glp.lp)];
+    std::vector<int> ind(1+LEMON_glp(get_num_cols)(glp.lp));
+    std::vector<Value> val(1+LEMON_glp(get_num_cols)(glp.lp));
     for (int i=1;i<=LEMON_glp(get_num_rows)(glp.lp);++i)
       {
-        len=LEMON_glp(get_mat_row)(glp.lp,i,ind,val);
-        LEMON_glp(set_mat_row)(lp, i,len,ind,val);
+        len=LEMON_glp(get_mat_row)(glp.lp,i,&*ind.begin(),&*val.begin());
+        LEMON_glp(set_mat_row)(lp, i,len,&*ind.begin(),&*val.begin());
         LEMON_glp(set_row_bnds)(lp,i,
                                 LEMON_glp(get_row_type)(glp.lp,i),