Verified Commit 0a53bb0a authored by ANA MANZANO RODRIGUEZ's avatar ANA MANZANO RODRIGUEZ Committed by Alberto Miranda
Browse files

More rebase changes done

parent 1e3790b1

src/common/api/admire_types.hpp

+3 −1
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ struct adhoc_storage : public storage { 
    adhoc_storage(const adhoc_storage& other) noexcept;

    /*adhoc_storage(enum storage::type type, std::string id, std::uint64_t server_id,

                  ADM_adhoc_context_t ctx);

    //adhoc_storage(enum storage::type type, std::string id, std::uint64_t server_id,

                  //ADM_adhoc_context_t ctx);

    adhoc_storage(enum storage::type type, std::string id,

                  const admire::adhoc_storage::ctx& ctx);*/
@@ -608,7 +610,7 @@ struct fmt::formatter<admire::adhoc_storage> : formatter<std::string_view> { 


        const auto str =

                fmt::format("{{type: {}, id: {}, context: {}}}", s.type(),

                            std::quoted(s.id()),

                            std::quoted(std::to_string(s.id())),

                            (pctx ? fmt::format("{}", *pctx) : "NULL"));

        return formatter<std::string_view>::format(str, ctx);

    }

src/common/api/convert.cpp

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ convert(const admire::adhoc_storage& st) { 
                    st.context()));                



    ADM_storage_t c_st = ADM_storage_create(

            st.id().c_str(), static_cast<ADM_storage_type_t>(st.type()),

            (std::to_string(st.id())).c_str(), static_cast<ADM_storage_type_t>(st.type()),

            managed_ctx.get());



    return managed_ctype<ADM_storage_t>{c_st, std::move(managed_ctx)};

src/lib/admire.cpp

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ remove_job(const server& srv, const job& job) { 
    return detail::remove_job(srv, job);

}



ADM_return_t

admire::adhoc_storage

register_adhoc_storage(const server& srv, const job& job, const std::string& id,

                       const adhoc_storage::ctx& ctx) {

src/lib/admire.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <stddef.h>

#include <stdint.h>

#include <stdbool.h>

#include <iostream>

#include "admire_types.h"



#ifdef __cplusplus

src/lib/admire.hpp

+1 −6
Original line number Diff line number Diff line
@@ -56,14 +56,9 @@ update_job(const server& srv, const job&, const job_requirements& reqs); 
ADM_return_t

remove_job(const server& srv, const job& job);



ADM_return_t

<<<<<<< HEAD

register_adhoc_storage(const server& srv, ADM_adhoc_context_t ctx,

                       ADM_storage_t* adhoc_storage);

=======

admire::adhoc_storage

register_adhoc_storage(const server& srv, const job& job, const std::string& id,

                       const adhoc_storage::ctx& ctx);

>>>>>>> 3eee4b5 (Files updated, some errors fixed)



ADM_return_t

update_adhoc_storage(const server& srv, ADM_adhoc_context_t ctx,