Ignore:
Timestamp:
03/22/12 19:39:32 (12 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: sdsave unit test

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

More refactoring


File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/external-alma/atnf/PKSIO/NROFITSDataset.h

    r2440 r2442  
    105105  // Read char data
    106106  int readHeader( string &v, char *name ) ;
    107   int readTable( char *v, char *name ) ;
    108   int readTable( char *v, char *name, int clen, int idx ) ;
    109   int readTable( vector<char *> &v, char *name, int idx ) ;
    110   int readColumn( vector<string> &v, char *name ) ;
    111   int readColumn( vector<string> &v, char *name, int idx ) ;
     107  int readTable( char *v, char *name, int clen, int idx=0 ) ;
     108  int readTable( vector<char *> &v, char *name, int idx=0 ) ;
     109  int readColumn( vector<string> &v, char *name, int idx=0 ) ;
    112110
    113111  // Read int data
    114112  int readHeader( int &v, char *name, int b ) ;
    115   int readTable( int &v, char *name, int b ) ;
    116   int readTable( int &v, char *name, int b, int idx ) ;
    117   int readTable( vector<int> &v, char *name, int b, int idx ) ;
    118   int readColumn( vector<int> &v, char *name, int b ) ;
    119   int readColumn( vector<int> &v, char *name, int b, int idx ) ;
     113  int readTable( int &v, char *name, int b, int idx=0 ) ;
     114  int readTable( vector<int> &v, char *name, int b, int idx=0 ) ;
     115  int readColumn( vector<int> &v, char *name, int b, int idx=0 ) ;
    120116
    121117  // Read float data
    122118  int readHeader( float &v, char *name, int b ) ;
    123   int readTable( float &v, char *name, int b ) ;
    124   int readTable( float &v, char *name, int b, int idx ) ;
    125   int readTable( vector<float> &v, char *name, int b, int idx ) ;
    126   int readColumn( vector<float> &v, char *name, int b ) ;
    127   int readColumn( vector<float> &v, char *name, int b, int idx ) ;
     119  int readTable( float &v, char *name, int b, int idx=0 ) ;
     120  int readTable( vector<float> &v, char *name, int b, int idx=0 ) ;
     121  int readColumn( vector<float> &v, char *name, int b, int idx=0 ) ;
    128122
    129123  // Read double data
    130124  int readHeader( double &v, char *name, int b ) ;
    131   int readTable( double &v, char *name, int b ) ;
    132   int readTable( double &v, char *name, int b, int idx ) ;
    133   int readTable( vector<double> &v, char *name, int b, int idx ) ;
    134   int readColumn( vector<double> &v, char *name, int b ) ;
    135   int readColumn( vector<double> &v, char *name, int b, int idx ) ;
     125  int readTable( double &v, char *name, int b, int idx=0 ) ;
     126  int readTable( vector<double> &v, char *name, int b, int idx=0 ) ;
     127  int readColumn( vector<double> &v, char *name, int b, int idx=0 ) ;
    136128
    137129  // read ARRY
Note: See TracChangeset for help on using the changeset viewer.