diff options
| author | Lexi Winter <lexi@hemlock.eden.le-fay.org> | 2025-03-26 15:53:05 +0000 |
|---|---|---|
| committer | Lexi Winter <lexi@hemlock.eden.le-fay.org> | 2025-03-26 15:53:05 +0000 |
| commit | e5524af2c2ce6dcccb0af8ebe711bf48ce7e52a9 (patch) | |
| tree | a8b3e243d56d1dd8c58d56deb13684017d4025f9 | |
| parent | 914c1b59502e7fd68da7629e794d5f5230b090ef (diff) | |
| download | libnvxx-e5524af2c2ce6dcccb0af8ebe711bf48ce7e52a9.tar.gz libnvxx-e5524af2c2ce6dcccb0af8ebe711bf48ce7e52a9.tar.bz2 | |
nvxx_util: namespace ptr_guard -> __ptr_guard
| -rw-r--r-- | libnvxx/const_nv_list.cc | 4 | ||||
| -rw-r--r-- | libnvxx/nv_list.cc | 23 | ||||
| -rw-r--r-- | libnvxx/nvxx_util.h | 12 |
3 files changed, 19 insertions, 20 deletions
diff --git a/libnvxx/const_nv_list.cc b/libnvxx/const_nv_list.cc index 8a3bab5..f53eee3 100644 --- a/libnvxx/const_nv_list.cc +++ b/libnvxx/const_nv_list.cc @@ -148,8 +148,8 @@ __const_nv_list::pack() const auto size = std::size_t{}; if (auto *data = nvlist_pack(__m_nv, &size); data != nullptr) { - auto bytes = ptr_guard(static_cast<std::byte *>(data)); - return {bytes.ptr, bytes.ptr + size}; + auto bytes = __ptr_guard(static_cast<std::byte *>(data)); + return {bytes.__ptr, bytes.__ptr + size}; } throw std::system_error(error()); diff --git a/libnvxx/nv_list.cc b/libnvxx/nv_list.cc index 69252ab..e81be28 100644 --- a/libnvxx/nv_list.cc +++ b/libnvxx/nv_list.cc @@ -254,10 +254,9 @@ std::vector<bool> __nv_list::take_bool_array(std::string_view key) { auto nitems = std::size_t{}; - auto ptr = ptr_guard(::nvlist_take_bool_array(__m_nv, - std::string(key).c_str(), - &nitems)); - return std::vector<bool>(ptr.ptr, ptr.ptr + nitems); + auto ptr = __ptr_guard(::nvlist_take_bool_array( + __m_nv, std::string(key).c_str(), &nitems)); + return std::vector<bool>(ptr.__ptr, ptr.__ptr + nitems); } void @@ -352,11 +351,11 @@ std::vector<std::uint64_t> __nv_list::take_number_array(std::string_view key) { auto nitems = std::size_t{}; - auto ptr = ptr_guard( + auto ptr = __ptr_guard( ::nvlist_take_number_array(__m_nv, std::string(key).c_str(), &nitems)); - return {ptr.ptr, ptr.ptr + nitems}; + return {ptr.__ptr, ptr.__ptr + nitems}; } void @@ -657,12 +656,12 @@ std::vector<nv_list> __nv_list::take_nvlist_array(std::string_view key) { auto nitems = std::size_t{}; - auto ptr = ptr_guard( + auto ptr = __ptr_guard( ::nvlist_take_nvlist_array(__m_nv, std::string(key).c_str(), &nitems)); return {std::from_range, - std::span(ptr.ptr, nitems) | construct<nv_list>()}; + std::span(ptr.__ptr, nitems) | construct<nv_list>()}; } void @@ -766,11 +765,11 @@ std::vector<int> __nv_list::take_descriptor_array(std::string_view key) { auto nitems = std::size_t{}; - auto ptr = ptr_guard( + auto ptr = __ptr_guard( ::nvlist_take_descriptor_array(__m_nv, std::string(key).c_str(), &nitems)); - return {ptr.ptr, ptr.ptr + nitems}; + return {ptr.__ptr, ptr.__ptr + nitems}; } /* @@ -825,8 +824,8 @@ __nv_list::take_binary(std::string_view key) auto size = std::size_t{}; auto *data = ::nvlist_take_binary(__m_nv, skey.c_str(), &size); - auto ptr = ptr_guard(static_cast<std::byte *>(data)); - return {ptr.ptr, ptr.ptr + size}; + auto ptr = __ptr_guard(static_cast<std::byte *>(data)); + return {ptr.__ptr, ptr.__ptr + size}; } } // namespace bsd diff --git a/libnvxx/nvxx_util.h b/libnvxx/nvxx_util.h index 2295541..005f147 100644 --- a/libnvxx/nvxx_util.h +++ b/libnvxx/nvxx_util.h @@ -31,15 +31,15 @@ namespace bsd::__detail { -template<typename T> -struct ptr_guard { - ptr_guard(T *ptr_) : ptr(ptr_) {} +template<typename _T> +struct __ptr_guard { + __ptr_guard(_T *__ptr_) : __ptr(__ptr_) {} - ~ptr_guard() { - std::free(ptr); + ~__ptr_guard() { + std::free(__ptr); } - T *ptr; + _T *__ptr; }; template<typename T> |