Revision 617 branches/big-buffers-test_smartlist/src/df1b2-separable/df1b2fun.h

df1b2fun.h (revision 617)
515 515
    char * buffend;
516 516
    char * bptr;
517 517
    char * sbptr;
518
    unsigned int bufsize;
518
    size_t bufsize;
519 519
    adstring filename;
520 520
    int fp;
521 521
    void saveposition(void){sbptr=bptr;}
......
528 528
    void set_noreadflag(int n){ noreadflag=n; }
529 529
    void restoreposition(void){bptr=sbptr;}
530 530
    void restoreposition(int offset){bptr=sbptr+offset;}
531
    test_smartlist(unsigned int bufsize,const adstring& filename);
532
    void allocate(unsigned int bufsize,const adstring& filename);
531
    test_smartlist(const size_t bufsize,const adstring& filename);
532
    void allocate(const size_t bufsize,const adstring& filename);
533 533
    test_smartlist(void);
534 534
    ~test_smartlist();
535 535
    void read_buffer(void);
......
538 538
    void set_reverse(void){direction=-1;}
539 539
    void rewind(void);
540 540
    void initialize(void);
541
    void operator -= (int);
542
    void operator += (int);
541
    void operator-=(const size_t);
542
    void operator+=(const size_t);
543 543
    double report_usage(void) 
544 544
    { 
545 545
      return double(size_t(bptr)-size_t(buffer))/double(size_t(buffend)-size_t(buffer));
546 546
    }
547
    void write(void * p,int n);
548
    void write(int n);
547
    void write(void* p, const size_t n);
548
    void write(const size_t n);
549 549
    void write_buffer(void);
550
    void check_buffer_size(int);
551
    void add_buffer_fringe(int n){buffend-=n;}
550
    void check_buffer_size(const size_t nsize);
551
    void add_buffer_fringe(const size_t n){buffend-=n;}
552 552
    int written(void){return written_flag;}
553 553
  };
554 554

  
......
697 697
  };
698 698

  
699 699

  
700
  void write(const test_smartlist &,void *,int nsize);
701
  void read(const test_smartlist &,void *,int nsize);
702
  void memcpy(const test_smartlist &,void *,int nsize);
703
  void memcpy(void *,const test_smartlist &,int nsize);
700
  void write(const test_smartlist &,void*, const size_t nsize);
701
  void read(const test_smartlist &,void*, const size_t nsize);
702
  void memcpy(const test_smartlist&, void*, const size_t nsize);
703
  void memcpy(void*, const test_smartlist&, const size_t nsize);
704 704

  
705 705
  class df1b2function2c;
706 706

  
......
725 725
    static int no_derivatives;
726 726
    static void set_no_derivatives(void) {no_derivatives=1;}
727 727
    static void set_yes_derivatives(void) {no_derivatives=0;}
728
    df1b2_gradlist(unsigned int bufsize,unsigned int nbufsize,
729
     unsigned int bufsize1, unsigned int nbufsize1,
730
     unsigned int bufsize2, unsigned int nbufsize2,const adstring& filename);
728
    df1b2_gradlist(const size_t bufsize, const size_t nbufsize,
729
     const size_t bufsize1, const size_t nbufsize1,
730
     const size_t bufsize2, const size_t nbufsize2, const adstring& filename);
731 731
    int mywrite_pass1(const df1b2variable * px, const df1b2variable * py,
732 732
      df1b2variable * pz, mydf1b2function2 * pf);
733 733
    int write_pass1_sum(double x, const df1b2variable * py,

Also available in: Unified diff