From c8507c3054b0c7fc2bc1328de80e21419a4c9468 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Tue, 6 May 2025 00:22:31 +0200 Subject: [PATCH] accomodate os changes --- plugins/plugin_mfs_wip.cpp | 6 +++--- src/convert_frag_to_obj.cpp | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/plugin_mfs_wip.cpp b/plugins/plugin_mfs_wip.cpp index c37c77b..887bef6 100644 --- a/plugins/plugin_mfs_wip.cpp +++ b/plugins/plugin_mfs_wip.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include @@ -13,7 +13,7 @@ #include #include -static std::unique_ptr g_fsb = nullptr; +static std::unique_ptr g_fsb = nullptr; static std::unique_ptr g_mfs = nullptr; constexpr const char* plugin_name = "MessageFragmentStore"; @@ -43,7 +43,7 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api) // static store, could be anywhere tho // construct with fetched dependencies - g_fsb = std::make_unique(*os, "test2_message_store/"); // TODO: use config? + g_fsb = std::make_unique(*os, "test2_message_store/"); // TODO: use config? g_mfs = std::make_unique(*cs, *rmm, *os, *g_fsb, *g_fsb, *msnj); // register types diff --git a/src/convert_frag_to_obj.cpp b/src/convert_frag_to_obj.cpp index 43e539e..fc7b2e2 100644 --- a/src/convert_frag_to_obj.cpp +++ b/src/convert_frag_to_obj.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include @@ -33,8 +33,8 @@ int main(int argc, const char** argv) { ObjectStore2 os_src; ObjectStore2 os_dst; - Backends::FilesystemStorage fsb_src(os_src, argv[1]); - Backends::FilesystemStorage fsb_dst(os_dst, argv[2]); + Backends::FilesystemStorageAtomic fsb_src(os_src, argv[1]); + Backends::FilesystemStorageAtomic fsb_dst(os_dst, argv[2]); ContactStore4Impl cs; // dummy RegistryMessageModelImpl rmm(cs); // dummy @@ -50,16 +50,16 @@ int main(int argc, const char** argv) { // hookup events struct EventListener : public ObjectStoreEventI { ObjectStore2& _os_src; - Backends::FilesystemStorage& _fsb_src; + Backends::FilesystemStorageAtomic& _fsb_src; ObjectStore2& _os_dst; - Backends::FilesystemStorage& _fsb_dst; + Backends::FilesystemStorageAtomic& _fsb_dst; EventListener( ObjectStore2& os_src, - Backends::FilesystemStorage& fsb_src, + Backends::FilesystemStorageAtomic& fsb_src, ObjectStore2& os_dst, - Backends::FilesystemStorage& fsb_dst + Backends::FilesystemStorageAtomic& fsb_dst ) : _os_src(os_src), _fsb_src(fsb_src),