diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-30 17:21:12 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-02 09:50:25 +0200 |
commit | f00705ae7ff3c1db805859e3be41e58ac70625b6 (patch) | |
tree | 7eb3cb268bba468c1e8c6f7b37a51b56993303d8 | |
parent | 47314e6daad8157c9e36af90a47b3ae7fa0587de (diff) | |
download | bitcoin-f00705ae7ff3c1db805859e3be41e58ac70625b6.tar.xz |
serialize: Deprecate `begin_ptr` / `end_ptr`
Implement `begin_ptr` and `end_ptr` in terms of C++11 code,
and add a comment that they are deprecated.
Follow-up to developer notes update in 654a21162252294b7dbd6c982fec88008af7335e.
-rw-r--r-- | src/prevector.h | 2 | ||||
-rw-r--r-- | src/serialize.h | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/prevector.h b/src/prevector.h index d840dfcd08..25bce522dc 100644 --- a/src/prevector.h +++ b/src/prevector.h @@ -476,7 +476,7 @@ public: } } - value_type* data() noexcept { + value_type* data() { return item_ptr(0); } diff --git a/src/serialize.h b/src/serialize.h index 04ab9aa2e7..1f51da82ff 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -44,33 +44,32 @@ inline T* NCONST_PTR(const T* val) return const_cast<T*>(val); } -/** - * Get begin pointer of vector (non-const version). - * @note These functions avoid the undefined case of indexing into an empty - * vector, as well as that of indexing after the end of the vector. +/** + * Important: Do not use the following functions in new code, but use v.data() + * and v.data() + v.size() respectively directly. They were once introduced to + * have a compatible, safe way to get the begin and end pointer of a vector. + * However with C++11 the language has built-in functionality for this and it's + * more readable to just use that. */ template <typename V> inline typename V::value_type* begin_ptr(V& v) { - return v.empty() ? NULL : &v[0]; + return v.data(); } -/** Get begin pointer of vector (const version) */ template <typename V> inline const typename V::value_type* begin_ptr(const V& v) { - return v.empty() ? NULL : &v[0]; + return v.data(); } -/** Get end pointer of vector (non-const version) */ template <typename V> inline typename V::value_type* end_ptr(V& v) { - return v.empty() ? NULL : (&v[0] + v.size()); + return v.data() + v.size(); } -/** Get end pointer of vector (const version) */ template <typename V> inline const typename V::value_type* end_ptr(const V& v) { - return v.empty() ? NULL : (&v[0] + v.size()); + return v.data() + v.size(); } /* |