diff --git a/Osi/test/OsiTestSolver.hpp b/Osi/test/OsiTestSolver.hpp index 1180ceb2..1d8c691c 100644 --- a/Osi/test/OsiTestSolver.hpp +++ b/Osi/test/OsiTestSolver.hpp @@ -21,12 +21,12 @@ #endif template static inline T -VolMax(register const T x, register const T y) { +VolMax(const T x, const T y) { return ((x) > (y)) ? (x) : (y); } template static inline T -VolAbs(register const T x) { +VolAbs(const T x) { return ((x) > 0) ? (x) : -(x); } @@ -502,7 +502,7 @@ class VOL_alpha_factor { const double alpha) { if (alpha < parm.alphamin) return 1.0; - register const double ll = VolAbs(lcost); + const double ll = VolAbs(lcost); const double x = ll > 10 ? (lcost-lastvalue)/ll : (lcost-lastvalue); lastvalue = lcost; return (x <= 0.01) ? parm.alphafactor : 1.0;