diff options
author | Sven Gothel <[email protected]> | 2022-12-30 13:00:56 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2022-12-30 13:00:56 +0100 |
commit | 618b31fc44d6bd37052f32eee47fa3490ef4883e (patch) | |
tree | fefe99116a9da99bf40c7856e3a845acb835edd3 /include/jau | |
parent | 2c37436492d7b9b85b755ce8629dce7e41ab67f8 (diff) |
C++20: Remove `constexpr_cxx20` from toString() methods not using constexpr or literals
Diffstat (limited to 'include/jau')
-rw-r--r-- | include/jau/cow_darray.hpp | 4 | ||||
-rw-r--r-- | include/jau/cow_iterator.hpp | 12 | ||||
-rw-r--r-- | include/jau/cow_vector.hpp | 2 | ||||
-rw-r--r-- | include/jau/darray.hpp | 4 | ||||
-rw-r--r-- | include/jau/ringbuffer.hpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/include/jau/cow_darray.hpp b/include/jau/cow_darray.hpp index be1cb35..5ace90f 100644 --- a/include/jau/cow_darray.hpp +++ b/include/jau/cow_darray.hpp @@ -1072,7 +1072,7 @@ namespace jau { return count; } - constexpr_cxx20 std::string toString() const noexcept { + std::string toString() const noexcept { std::string res("{ " + std::to_string( size() ) + ": "); int i=0; jau::for_each_const(*this, [&res, &i](const value_type & e) { @@ -1083,7 +1083,7 @@ namespace jau { return res; } - constexpr_cxx20 std::string get_info() const noexcept { + std::string get_info() const noexcept { return ("cow_darray[this "+jau::to_hexstring(this)+ ", "+store_ref->get_info()+ "]"); diff --git a/include/jau/cow_iterator.hpp b/include/jau/cow_iterator.hpp index 837cb7c..1310129 100644 --- a/include/jau/cow_iterator.hpp +++ b/include/jau/cow_iterator.hpp @@ -459,15 +459,15 @@ namespace jau { constexpr difference_type operator-(const cow_rw_iterator& rhs) const noexcept { return iterator_ - rhs.iterator_; } - constexpr_cxx20 std::string toString() const noexcept { + inline std::string toString() const noexcept { return jau::to_string(iterator_); } #if 0 - constexpr_cxx20 operator std::string() const noexcept { + inline operator std::string() const noexcept { return toString(); } #endif - constexpr_cxx20 std::string get_info() const noexcept { + std::string get_info() const noexcept { return "cow_rw_iterator[this "+jau::to_hexstring(this)+", CoW "+jau::to_hexstring(&cow_parent_)+ ", store "+jau::to_hexstring(&store_ref_)+ ", "+jau::to_string(iterator_)+"]"; @@ -925,15 +925,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_cxx20 std::string toString() const noexcept { + inline std::string toString() const noexcept { return jau::to_string(iterator_); } #if 0 - constexpr_cxx20 operator std::string() const noexcept { + inline operator std::string() const noexcept { return toString(); } #endif - constexpr_cxx20 std::string get_info() const noexcept { + std::string get_info() const noexcept { return "cow_ro_iterator[this "+jau::to_hexstring(this)+ ", store "+jau::to_hexstring(&store_ref_)+ ", "+jau::to_string(iterator_)+"]"; diff --git a/include/jau/cow_vector.hpp b/include/jau/cow_vector.hpp index b62b74d..8f1cf76 100644 --- a/include/jau/cow_vector.hpp +++ b/include/jau/cow_vector.hpp @@ -634,7 +634,7 @@ namespace jau { return count; } - constexpr_cxx20 std::string toString() const noexcept { + std::string toString() const noexcept { std::string res("{ " + std::to_string( size() ) + ": "); int i=0; jau::for_each_const(*this, [&res, &i](const value_type & e) { diff --git a/include/jau/darray.hpp b/include/jau/darray.hpp index ba87937..f87d1a3 100644 --- a/include/jau/darray.hpp +++ b/include/jau/darray.hpp @@ -1316,7 +1316,7 @@ In copy constructor ‘std::__shared_count<_Lp>::__shared_count(const std::__sha return count; } - constexpr_cxx20 std::string toString() const noexcept { + std::string toString() const noexcept { std::string res("{ " + std::to_string( size() ) + ": "); int i=0; jau::for_each_const(*this, [&res, &i](const value_type & e) { @@ -1327,7 +1327,7 @@ In copy constructor ‘std::__shared_count<_Lp>::__shared_count(const std::__sha return res; } - constexpr_cxx20 std::string get_info() const noexcept { + std::string get_info() const noexcept { difference_type cap_ = (storage_end_-begin_); difference_type size_ = (end_-begin_); std::string res("darray[this "+jau::to_hexstring(this)+ diff --git a/include/jau/ringbuffer.hpp b/include/jau/ringbuffer.hpp index e2abb73..d661d26 100644 --- a/include/jau/ringbuffer.hpp +++ b/include/jau/ringbuffer.hpp @@ -991,7 +991,7 @@ class ringbuffer { fprintf(stream, "%s %s, array %p\n", prefix.c_str(), toString().c_str(), array); } - constexpr_cxx20 std::string get_info() const noexcept { + std::string get_info() const noexcept { const std::string e_s = isEmpty() ? ", empty" : ""; const std::string f_s = isFull() ? ", full" : ""; const std::string mode_s = getMultiPCEnabled() ? ", mpc" : ", one"; |