external/coinmp/register.patch

   1 --- CoinUtils/src/CoinOslC.h
   2 +++ CoinUtils/src/CoinOslC.h
   3 @@ -34,30 +34,30 @@
   4  extern "C"{
   5  #endif
   6
   7 -int c_ekkbtrn( register const EKKfactinfo *fact,
   8 +int c_ekkbtrn( const EKKfactinfo *fact,
   9             double *dwork1,
  10             int * mpt,int first_nonzero);
  11 -int c_ekkbtrn_ipivrw( register const EKKfactinfo *fact,
  12 +int c_ekkbtrn_ipivrw( const EKKfactinfo *fact,
  13                    double *dwork1,
  14                    int * mpt, int ipivrw,int * spare);
  15
  16 -int c_ekketsj( register /*const*/ EKKfactinfo *fact,
  17 +int c_ekketsj( /*const*/ EKKfactinfo *fact,
  18             double *dwork1,
  19             int *mpt2, double dalpha, int orig_nincol,
  20             int npivot, int *nuspikp,
  21             const int ipivrw, int * spare);
  22 -int c_ekkftrn( register const EKKfactinfo *fact,
  23 +int c_ekkftrn( const EKKfactinfo *fact,
  24             double *dwork1,
  25             double * dpermu,int * mpt, int numberNonZero);
  26
  27 -int c_ekkftrn_ft( register EKKfactinfo *fact,
  28 +int c_ekkftrn_ft( EKKfactinfo *fact,
  29                double *dwork1, int *mpt, int *nincolp);
  30 -void c_ekkftrn2( register EKKfactinfo *fact, double *dwork1,
  31 +void c_ekkftrn2( EKKfactinfo *fact, double *dwork1,
  32               double * dpermu1,int * mpt1, int *nincolp,
  33              double *dwork1_ft, int *mpt_ft, int *nincolp_ft);
  34
  35 -int c_ekklfct( register EKKfactinfo *fact);
  36 -int c_ekkslcf( register const EKKfactinfo *fact);
  37 +int c_ekklfct( EKKfactinfo *fact);
  38 +int c_ekkslcf( const EKKfactinfo *fact);
  39  inline void c_ekkscpy(int n, const int *marr1,int *marr2)
  40  { CoinMemcpyN(marr1,n,marr2);}
  41  inline void c_ekkdcpy(int n, const double *marr1,double *marr2)
  42 --- CoinUtils/src/CoinOslFactorization2.cpp
  43 +++ CoinUtils/src/CoinOslFactorization2.cpp
  44 @@ -20,9 +20,9 @@
  45  extern int ets_count;
  46  extern int ets_check;
  47  #endif
  48 -#define COIN_REGISTER register
  49 +#define COIN_REGISTER
  50  #define COIN_REGISTER2
  51 -#define COIN_REGISTER3 register
  52 +#define COIN_REGISTER3
  53  #ifdef COIN_USE_RESTRICT
  54  # define COIN_RESTRICT2 __restrict
  55  #else
  56 --- CoinUtils/src/CoinOslFactorization3.cpp
  57 +++ CoinUtils/src/CoinOslFactorization3.cpp
  58 @@ -1378,7 +1378,7 @@
  59      }
  60    }
  61  } /* c_ekkmltf */
  62 -int c_ekklfct( register EKKfactinfo *fact)
  63 +int c_ekklfct( EKKfactinfo *fact)
  64  {
  65    const int nrow       = fact->nrow;
  66    int ninbas = fact->xcsadr[nrow+1]-1;
  67 @@ -2607,7 +2607,7 @@
  68      }
  69    }
  70  } /* c_ekkclcp */
  71 -int c_ekkslcf( register const EKKfactinfo *fact)
  72 +int c_ekkslcf( const EKKfactinfo *fact)
  73  {
  74    int * hrow = fact->xeradr;
  75    int * hcol = fact->xecadr;