Changeset 0becf48 in tol


Ignore:
Timestamp:
Oct 5, 2015, 4:52:32 PM (11 years ago)
Author:
Jorge Pérez <josp.jorge@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
da4af657
Parents:
0710f17
Message:

refs #1866,

REVIEW: for compatibility size_t will be written/read as 4 bytes
 Write is not overloaded because size_t has different sizes in 32 & 64 bits

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6914 be4846ae-f051-483a-831f-b64e7d08527f

Location:
tol
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • tol/OIS/tol_oiscreator.h

    r0710f17 r0becf48  
    6868  bool Write(const unsigned BINT64&  x, BStream* stream);
    6969  // REVIEW: for compatibility size_t will be written/read as 4 bytes
    70 #if defined(_LP64) || defined(_WIN64)
    71    bool Write(const          size_t&  x, BStream* stream)
     70  // Write is not overloaded because size_t has different sizes in 32 & 64 bits
     71  bool Write_size_t(const          size_t&  x, BStream* stream)
    7272  {
    7373    unsigned int _x = (unsigned int)x;
    7474    return this->Write( _x, stream );
    7575  }
    76 #endif
    7776  bool Write(const          float&   x, BStream* stream);
    7877  bool Write(const          double&  x, BStream* stream);

  • tol/OIS/tol_oisloader.h

    r0710f17 r0becf48  
    103103  bool Read(unsigned BINT64&  x, BStream* stream);
    104104  // REVIEW: for compatibility size_t will be written/read as 4 bytes
    105 #if defined(_LP64) || defined(_WIN64)
    106   bool Read(size_t &     x, BStream* stream)
     105  // Read is not overloaded because size_t has different sizes in 32 & 64 bits
     106  bool Read_size_t(size_t &     x, BStream* stream)
    107107  {
    108108    unsigned int _x;
    … …  
    114114    return ok;
    115115  }
    116 #endif
    117116  bool Read(         float&   x, BStream* stream);
    118117  bool Read(         double&  x, BStream* stream);

  • tol/btol/vmatrix_type/vmat_io.cpp

    r0710f17 r0becf48  
    515515    return(false);
    516516  }
    517   Ensure(ois.Write(a.nrow,  stream));
    518   Ensure(ois.Write(a.ncol,  stream));
    519   Ensure(ois.Write(a.d,     stream));
     517  Ensure(ois.Write_size_t(a.nrow,  stream));
     518  Ensure(ois.Write_size_t(a.ncol,  stream));
     519  Ensure(ois.Write_size_t(a.d,     stream));
    520520  Ensure(ois.Write(a.xtype, stream));
    521   Ensure(ois.Write(a.nzmax, stream));
     521  Ensure(ois.Write_size_t(a.nzmax, stream));
    522522  Ensure(ois.Write(a.dtype, stream));
    523523  Ensure(ois.Write(a.x,     a.nzmax, sizeof(double), stream));
    … …  
    534534    sizeof(cholmod_dense),common_);
    535535  cholmod_dense& a = *s_.blasRdense_;
    536   Ensure(ois.Read(a.nrow,  stream));
    537   Ensure(ois.Read(a.ncol,  stream));
    538   Ensure(ois.Read(a.d,     stream));
     536  Ensure(ois.Read_size_t(a.nrow,  stream));
     537  Ensure(ois.Read_size_t(a.ncol,  stream));
     538  Ensure(ois.Read_size_t(a.d,     stream));
    539539  Ensure(ois.Read(a.xtype, stream));
    540   Ensure(ois.Read(a.nzmax, stream));
     540  Ensure(ois.Read_size_t(a.nzmax, stream));
    541541  Ensure(ois.Read(a.dtype, stream));
    542542  a.x = cholmod_malloc(a.nzmax, sizeof(double), common_);
    … …  
    565565    return(false);
    566566  }
    567   Ensure(ois.Write(a.nrow,   stream));
    568   Ensure(ois.Write(a.ncol,   stream));
    569   Ensure(ois.Write(a.nzmax,  stream));
     567  Ensure(ois.Write_size_t(a.nrow,   stream));
     568  Ensure(ois.Write_size_t(a.ncol,   stream));
     569  Ensure(ois.Write_size_t(a.nzmax,  stream));
    570570  Ensure(ois.Write(a.stype,  stream));
    571571  Ensure(ois.Write(a.itype,  stream));
    … …  
    593593    sizeof(cholmod_sparse),common_);
    594594  cholmod_sparse& a = *s_.chlmRsparse_;
    595   Ensure(ois.Read(a.nrow,   stream));
    596   Ensure(ois.Read(a.ncol,   stream));
    597   Ensure(ois.Read(a.nzmax,  stream));
     595  Ensure(ois.Read_size_t(a.nrow,   stream));
     596  Ensure(ois.Read_size_t(a.ncol,   stream));
     597  Ensure(ois.Read_size_t(a.nzmax,  stream));
    598598  Ensure(ois.Read(a.stype,  stream));
    599599  Ensure(ois.Read(a.itype,  stream));
    … …  
    641641    return(false);
    642642  }
    643   Ensure(ois.Write(a.n,            stream));
    644   Ensure(ois.Write(a.minor,        stream));
    645   Ensure(ois.Write(a.nzmax,        stream));
     643  Ensure(ois.Write_size_t(a.n,            stream));
     644  Ensure(ois.Write_size_t(a.minor,        stream));
     645  Ensure(ois.Write_size_t(a.nzmax,        stream));
    646646  Ensure(ois.Write(a.itype,        stream));
    647647  Ensure(ois.Write(a.xtype,        stream));
    … …  
    666666  {
    667667        //writes a supernodal factor
    668     Ensure(ois.Write(a.nsuper,   stream));
    669     Ensure(ois.Write(a.xsize,    stream));
    670     Ensure(ois.Write(a.ssize,    stream));
    671     Ensure(ois.Write(a.maxcsize, stream));
    672     Ensure(ois.Write(a.maxesize, stream));
     668    Ensure(ois.Write_size_t(a.nsuper,   stream));
     669    Ensure(ois.Write_size_t(a.xsize,    stream));
     670    Ensure(ois.Write_size_t(a.ssize,    stream));
     671    Ensure(ois.Write_size_t(a.maxcsize, stream));
     672    Ensure(ois.Write_size_t(a.maxesize, stream));
    673673    Ensure(ois.Write(a.super,    a.nsuper+1, sizeof(int),    stream));
    674674    Ensure(ois.Write(a.pi,       a.nsuper+1, sizeof(int),    stream));
    … …  
    687687  code_ = ESC_chlmRfactor;
    688688  size_t n;
    689   Ensure(ois.Read(n, stream));
     689  Ensure(ois.Read_size_t(n, stream));
    690690  s_.chlmRfactor_ = (cholmod_factor*)cholmod_malloc(1,
    691691    sizeof(cholmod_factor),common_);
    … …  
    693693  a.n = n;
    694694  size_t& nzmax = a.nzmax;
    695   Ensure(ois.Read(a.minor,        stream));
    696   Ensure(ois.Read(a.nzmax,        stream));
     695  Ensure(ois.Read_size_t(a.minor,        stream));
     696  Ensure(ois.Read_size_t(a.nzmax,        stream));
    697697  Ensure(ois.Read(a.itype,        stream));
    698698  Ensure(ois.Read(a.xtype,        stream));
    … …  
    744744    a.i     = NULL;
    745745        //reads supernodal dimensions
    746     Ensure(ois.Read(a.nsuper,   stream));
    747     Ensure(ois.Read(a.xsize,    stream));
    748     Ensure(ois.Read(a.ssize,    stream));
    749     Ensure(ois.Read(a.maxcsize, stream));
    750     Ensure(ois.Read(a.maxesize, stream));
     746    Ensure(ois.Read_size_t(a.nsuper,   stream));
     747    Ensure(ois.Read_size_t(a.xsize,    stream));
     748    Ensure(ois.Read_size_t(a.ssize,    stream));
     749    Ensure(ois.Read_size_t(a.maxcsize, stream));
     750    Ensure(ois.Read_size_t(a.maxesize, stream));
    751751  //allocate supernodal vectors
    752752    a.super = cholmod_malloc(a.nsuper+1, sizeof(int),    common_);
    … …  
    784784    return(false);
    785785  }
    786   Ensure(ois.Write(a.nrow,  stream));
    787   Ensure(ois.Write(a.ncol,  stream));
    788   Ensure(ois.Write(a.nzmax, stream));
     786  Ensure(ois.Write_size_t(a.nrow,  stream));
     787  Ensure(ois.Write_size_t(a.ncol,  stream));
     788  Ensure(ois.Write_size_t(a.nzmax, stream));
    789789  Ensure(ois.Write(a.stype, stream));
    790790  Ensure(ois.Write(a.xtype, stream));
    791   Ensure(ois.Write(a.nnz,   stream));
     791  Ensure(ois.Write_size_t(a.nnz,   stream));
    792792  Ensure(ois.Write(a.itype, stream));
    793793  Ensure(ois.Write(a.dtype, stream));
    … …  
    807807    sizeof(cholmod_triplet),common_);
    808808  cholmod_triplet& a = *s_.chlmRtriplet_;
    809   Ensure(ois.Read(a.nrow,  stream));
    810   Ensure(ois.Read(a.ncol,  stream));
    811   Ensure(ois.Read(a.nzmax, stream));
     809  Ensure(ois.Read_size_t(a.nrow,  stream));
     810  Ensure(ois.Read_size_t(a.ncol,  stream));
     811  Ensure(ois.Read_size_t(a.nzmax, stream));
    812812  Ensure(ois.Read(a.stype, stream));
    813813  Ensure(ois.Read(a.xtype, stream));
    814   Ensure(ois.Read(a.nnz,   stream));
     814  Ensure(ois.Read_size_t(a.nnz,   stream));
    815815  Ensure(ois.Read(a.itype, stream));
    816816  Ensure(ois.Read(a.dtype, stream));
Note: See TracChangeset for help on using the changeset viewer.