Commit 20a4986ee9eb032dff289588cdcee190cba6edcc

Authored by knodlseder
1 parent 9c228179

move save() and clone() methods to private

include/GFitsTableCol.hpp
... ... @@ -49,11 +49,9 @@ public:
49 49 GFitsTableCol& operator= (const GFitsTableCol& column);
50 50  
51 51 // Virtual Methods
52   - virtual void save(void) = 0;
53   - virtual std::string string(const int& row, const int& inx = 0) = 0;
54   - virtual double real(const int& row, const int& inx = 0) = 0;
55   - virtual int integer(const int& row, const int& inx = 0) = 0;
56   - virtual GFitsTableCol* clone(void) const = 0;
  52 + virtual std::string string(const int& row, const int& inx = 0) = 0;
  53 + virtual double real(const int& row, const int& inx = 0) = 0;
  54 + virtual int integer(const int& row, const int& inx = 0) = 0;
57 55  
58 56 // Base class Methods
59 57 void name(const std::string& name);
... ... @@ -85,13 +83,15 @@ protected:
85 83 __fitsfile m_fitsfile; //!< FITS file associated with column
86 84  
87 85 // Protected virtual methods
88   - virtual std::string ascii_format(void) const = 0;
89   - virtual std::string binary_format(void) const = 0;
90   - virtual void alloc_data(void) = 0;
91   - virtual void init_data(void) = 0;
92   - virtual void fetch_data(void) = 0;
93   - virtual void* ptr_data(void) = 0;
94   - virtual void* ptr_nulval(void) = 0;
  86 + virtual void save(void) = 0;
  87 + virtual GFitsTableCol* clone(void) const = 0;
  88 + virtual std::string ascii_format(void) const = 0;
  89 + virtual std::string binary_format(void) const = 0;
  90 + virtual void alloc_data(void) = 0;
  91 + virtual void init_data(void) = 0;
  92 + virtual void fetch_data(void) = 0;
  93 + virtual void* ptr_data(void) = 0;
  94 + virtual void* ptr_nulval(void) = 0;
95 95  
96 96 // Protected methods
97 97 void load_column(void);
... ...
include/GFitsTableDblCol.hpp
... ... @@ -55,26 +55,26 @@ public:
55 55 const double& operator() (const int& row, const int& inx = 0) const;
56 56  
57 57 // Methods
58   - void save(void);
59 58 std::string string(const int& row, const int& inx = 0);
60 59 double real(const int& row, const int& inx = 0);
61 60 int integer(const int& row, const int& inx = 0);
62   - GFitsTableDblCol* clone(void) const;
63 61 double* data(void);
64 62 void set_nullval(const double* value);
65 63  
66 64 private:
67 65 // Private methods
68   - void init_members(void);
69   - void copy_members(const GFitsTableDblCol& column);
70   - void free_members(void);
71   - std::string ascii_format(void) const;
72   - std::string binary_format(void) const;
73   - void alloc_data(void);
74   - void init_data(void);
75   - void fetch_data(void);
76   - void* ptr_data(void) { return m_data; }
77   - void* ptr_nulval(void) { return m_nulval; }
  66 + void init_members(void);
  67 + void copy_members(const GFitsTableDblCol& column);
  68 + void free_members(void);
  69 + void save(void);
  70 + GFitsTableDblCol* clone(void) const;
  71 + std::string ascii_format(void) const;
  72 + std::string binary_format(void) const;
  73 + void alloc_data(void);
  74 + void init_data(void);
  75 + void fetch_data(void);
  76 + void* ptr_data(void) { return m_data; }
  77 + void* ptr_nulval(void) { return m_nulval; }
78 78  
79 79 // Private data area
80 80 double* m_data; //!< Data area
... ...