diff options
author | Sven Gothel <[email protected]> | 2021-02-09 02:29:27 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2021-02-09 02:29:27 +0100 |
commit | 477057328a047674f17d55aba35961a412529340 (patch) | |
tree | 1f0d06e2faa09d3517847ca06de67aeb463ae290 /include/jau/cow_iterator.hpp | |
parent | 323d06def9557725c519d89dd127b6f36df359ed (diff) |
Reverting macro change of 'constexpr_*', removing the '_func' addition (shorter and correct).
Reverting macro change of 'constexpr_*' 112528c73f09b262bd53f817f9d9ff9343af0ee9, removing the '_func' addition.
This is not also back to the shorter version, but also correct as it reads since C++17:
"A `constexpr` specifier used in a function or static member variable (since C++17) declaration implies `inline`."
Hence it includes static member variables, not only covering functions.
Enhanced the API doc.
Diffstat (limited to 'include/jau/cow_iterator.hpp')
-rw-r--r-- | include/jau/cow_iterator.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/jau/cow_iterator.hpp b/include/jau/cow_iterator.hpp index f0dce50..55a623a 100644 --- a/include/jau/cow_iterator.hpp +++ b/include/jau/cow_iterator.hpp @@ -456,15 +456,15 @@ namespace jau { constexpr difference_type operator-(const cow_rw_iterator& rhs) const noexcept { return iterator_ - rhs.iterator_; } - constexpr_func_cxx20 std::string toString() const noexcept { + constexpr_cxx20 std::string toString() const noexcept { return jau::to_string(iterator_); } #if 0 - constexpr_func_cxx20 operator std::string() const noexcept { + constexpr_cxx20 operator std::string() const noexcept { return toString(); } #endif - constexpr_func_cxx20 std::string get_info() const noexcept { + constexpr_cxx20 std::string get_info() const noexcept { return "cow_rw_iterator[this "+jau::aptrHexString(this)+", CoW "+jau::aptrHexString(&cow_parent_)+ ", store "+jau::aptrHexString(&store_ref_)+ ", "+jau::to_string(iterator_)+"]"; @@ -922,15 +922,15 @@ namespace jau { constexpr difference_type distance(const cow_rw_iterator<storage_t, storage_ref_t, cow_container_t>& rhs) const noexcept { return iterator_ - rhs.iterator_; } - constexpr_func_cxx20 std::string toString() const noexcept { + constexpr_cxx20 std::string toString() const noexcept { return jau::to_string(iterator_); } #if 0 - constexpr_func_cxx20 operator std::string() const noexcept { + constexpr_cxx20 operator std::string() const noexcept { return toString(); } #endif - constexpr_func_cxx20 std::string get_info() const noexcept { + constexpr_cxx20 std::string get_info() const noexcept { return "cow_ro_iterator[this "+jau::aptrHexString(this)+ ", store "+jau::aptrHexString(&store_ref_)+ ", "+jau::to_string(iterator_)+"]"; |