Commit 1a84947ddc08a01e0f4be710801b8ecbf3449bf4
1 parent
c8793517
declare fetch_data const
Showing
4 changed files
with
12 additions
and
12 deletions
include/GFitsTableBoolCol.hpp
| ... | ... | @@ -82,7 +82,7 @@ private: |
| 82 | 82 | void release_data(void); |
| 83 | 83 | void alloc_nulval(const bool* value); |
| 84 | 84 | void init_data(void); |
| 85 | - void fetch_data(void); | |
| 85 | + void fetch_data(void) const; | |
| 86 | 86 | void alloc_buffer(void); |
| 87 | 87 | void free_buffer(void); |
| 88 | 88 | void* ptr_data(void) { return m_buffer; } | ... | ... |
include/GFitsTableStringCol.hpp
| ... | ... | @@ -79,7 +79,7 @@ private: |
| 79 | 79 | void release_data(void); |
| 80 | 80 | void alloc_nulval(const std::string& value); |
| 81 | 81 | void init_data(void); |
| 82 | - void fetch_data(void); | |
| 82 | + void fetch_data(void) const; | |
| 83 | 83 | void alloc_buffer(void); |
| 84 | 84 | void free_buffer(void); |
| 85 | 85 | void* ptr_data(void) { return m_buffer; } | ... | ... |
src/fits/GFitsTableBoolCol.cpp
| ... | ... | @@ -690,26 +690,26 @@ void GFitsTableBoolCol::init_data(void) |
| 690 | 690 | * |
| 691 | 691 | * Refer to GFitsTableCol::load_column for more information. |
| 692 | 692 | ***************************************************************************/ |
| 693 | -void GFitsTableBoolCol::fetch_data(void) | |
| 693 | +void GFitsTableBoolCol::fetch_data(void) const | |
| 694 | 694 | { |
| 695 | 695 | // Calculate size of memory |
| 696 | 696 | m_size = m_number * m_length; |
| 697 | 697 | |
| 698 | 698 | // Free old buffer memory |
| 699 | - free_buffer(); | |
| 699 | + const_cast<GFitsTableBoolCol*>(this)->free_buffer(); | |
| 700 | 700 | |
| 701 | 701 | // Allocate buffer memory |
| 702 | - alloc_buffer(); | |
| 702 | + const_cast<GFitsTableBoolCol*>(this)->alloc_buffer(); | |
| 703 | 703 | |
| 704 | 704 | // Save column |
| 705 | - load_column(); | |
| 705 | + const_cast<GFitsTableBoolCol*>(this)->load_column(); | |
| 706 | 706 | |
| 707 | 707 | // Extract values from buffer |
| 708 | 708 | for (int i = 0; i < m_size; ++i) |
| 709 | 709 | m_data[i] = (bool)m_buffer[i]; |
| 710 | 710 | |
| 711 | 711 | // Free buffer memory |
| 712 | - free_buffer(); | |
| 712 | + const_cast<GFitsTableBoolCol*>(this)->free_buffer(); | |
| 713 | 713 | |
| 714 | 714 | // Return |
| 715 | 715 | return; | ... | ... |
src/fits/GFitsTableStringCol.cpp
| ... | ... | @@ -719,19 +719,19 @@ void GFitsTableStringCol::init_data(void) |
| 719 | 719 | * |
| 720 | 720 | * Refer to GFitsTableCol::load_column for more information. |
| 721 | 721 | ***************************************************************************/ |
| 722 | -void GFitsTableStringCol::fetch_data(void) | |
| 722 | +void GFitsTableStringCol::fetch_data(void) const | |
| 723 | 723 | { |
| 724 | 724 | // Calculate size of memory |
| 725 | 725 | m_size = m_number * m_length; |
| 726 | 726 | |
| 727 | 727 | // Free old buffer memory |
| 728 | - free_buffer(); | |
| 728 | + const_cast<GFitsTableStringCol*>(this)->free_buffer(); | |
| 729 | 729 | |
| 730 | 730 | // Allocate buffer memory |
| 731 | - alloc_buffer(); | |
| 731 | + const_cast<GFitsTableStringCol*>(this)->alloc_buffer(); | |
| 732 | 732 | |
| 733 | 733 | // Save column |
| 734 | - load_column(); | |
| 734 | + const_cast<GFitsTableStringCol*>(this)->load_column(); | |
| 735 | 735 | |
| 736 | 736 | // Extract string from buffer |
| 737 | 737 | for (int i = 0; i < m_size; ++i) { |
| ... | ... | @@ -740,7 +740,7 @@ void GFitsTableStringCol::fetch_data(void) |
| 740 | 740 | } |
| 741 | 741 | |
| 742 | 742 | // Free buffer memory |
| 743 | - free_buffer(); | |
| 743 | + const_cast<GFitsTableStringCol*>(this)->free_buffer(); | |
| 744 | 744 | |
| 745 | 745 | // Return |
| 746 | 746 | return; | ... | ... |