Verified Commit 2478cf00 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Rename c_ptr to ctype_ptr

parent 66f4402a

src/common/utils/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -26,4 +26,4 @@ add_library(_utils STATIC) 


set_property(TARGET _utils PROPERTY POSITION_INDEPENDENT_CODE ON)



target_sources(_utils PRIVATE utils.hpp utils.cpp signal_listener.hpp c_ptr.hpp)
 
target_sources(_utils PRIVATE utils.hpp utils.cpp signal_listener.hpp ctype_ptr.hpp)

src/common/utils/c_ptr.hpp→src/common/utils/ctype_ptr.hpp

+5 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct deleter { 
};



template <typename T, auto fn>

using c_ptr =

using ctype_ptr =

        std::unique_ptr<typename std::remove_pointer<T>::type,

                        deleter<typename std::remove_pointer<T>::type, fn>>;
@@ -53,11 +53,11 @@ using c_ptr = 
// available). Can also be used to directly pass an array of C pointers to C

// APIs by means of the data() function.

template <typename T, auto fn>

struct c_ptr_vector {

struct ctype_ptr_vector {



    c_ptr_vector() = default;

    ctype_ptr_vector() = default;



    ~c_ptr_vector() = default;

    ~ctype_ptr_vector() = default;



    constexpr void

    reserve(size_t n) {
@@ -87,7 +87,7 @@ struct c_ptr_vector { 
        return m_data.size();

    }



    std::vector<scord::utils::c_ptr<T, fn>> m_data{};

    std::vector<scord::utils::ctype_ptr<T, fn>> m_data{};

    std::vector<T> m_addrs{};

};

src/lib/admire.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <net/engine.hpp>

#include <net/proto/rpc_types.h>

#include <logger/logger.hpp>

#include <utils/c_ptr.hpp>

#include <utils/ctype_ptr.hpp>

#include "detail/impl.hpp"

src/lib/admire_types.hpp

+8 −8
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <vector>

#include <filesystem>

#include <fmt/format.h>

#include <utils/c_ptr.hpp>

#include <utils/ctype_ptr.hpp>

#include "admire_types.h"



namespace admire {
@@ -269,7 +269,7 @@ template <> 
struct admire::managed_rpc_type<admire::adhoc_storage::ctx> {



    template <typename T, auto Deleter>

    using managed_ptr = scord::utils::c_ptr<T, Deleter>;

    using managed_ptr = scord::utils::ctype_ptr<T, Deleter>;



    explicit managed_rpc_type(const admire::adhoc_storage::ctx& ctx)

        : m_adhoc_context(ADM_adhoc_context_create(
@@ -290,10 +290,10 @@ template <> 
struct admire::managed_rpc_type<admire::adhoc_storage> {



    template <typename T, auto Deleter>

    using rpc_storage_ptr = scord::utils::c_ptr<T, Deleter>;

    using rpc_storage_ptr = scord::utils::ctype_ptr<T, Deleter>;



    template <typename T, auto Deleter>

    using managed_ptr = scord::utils::c_ptr<T, Deleter>;

    using managed_ptr = scord::utils::ctype_ptr<T, Deleter>;



    explicit managed_rpc_type(const admire::adhoc_storage& st)

        : m_adhoc_context(*std::static_pointer_cast<admire::adhoc_storage::ctx>(
@@ -315,7 +315,7 @@ template <> 
struct admire::managed_rpc_type<std::vector<admire::dataset>> {



    template <typename T, auto Deleter>

    using managed_ptr_vector = scord::utils::c_ptr_vector<T, Deleter>;

    using managed_ptr_vector = scord::utils::ctype_ptr_vector<T, Deleter>;



    explicit managed_rpc_type(const std::vector<admire::dataset>& datasets) {

        m_datasets.reserve(datasets.size());
@@ -347,7 +347,7 @@ template <> 
struct admire::managed_rpc_type<admire::job_requirements> {



    template <typename T, auto Deleter>

    using rpc_requirements_ptr = scord::utils::c_ptr<T, Deleter>;

    using rpc_requirements_ptr = scord::utils::ctype_ptr<T, Deleter>;



    explicit managed_rpc_type(const admire::job_requirements& reqs)

        : m_inputs(reqs.inputs()), m_outputs(reqs.outputs()),
@@ -379,7 +379,7 @@ template <> 
struct admire::managed_rpc_type<admire::job> {



    template <typename T, auto Deleter>

    using rpc_job_ptr = scord::utils::c_ptr<T, Deleter>;

    using rpc_job_ptr = scord::utils::ctype_ptr<T, Deleter>;



    explicit managed_rpc_type(const admire::job& j)

        : m_job(ADM_job_create(j.id())) {}
@@ -396,7 +396,7 @@ template <> 
struct admire::managed_rpc_type<ADM_job_t> {



    template <typename T, auto Deleter>

    using rpc_job_ptr = scord::utils::c_ptr<T, Deleter>;

    using rpc_job_ptr = scord::utils::ctype_ptr<T, Deleter>;



    explicit managed_rpc_type(ADM_job_t job) : m_job(job) {}

src/lib/types.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <logger/logger.hpp>

#include <net/proto/rpc_types.h>

#include <utility>

#include <utils/c_ptr.hpp>

#include <utils/ctype_ptr.hpp>

#include <cstdarg>

#include "admire_types.hpp"