From ea9cdd09dca004880df67a3f86754def6e3d873f Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Tue, 15 Oct 2024 23:17:18 -0400 Subject: [PATCH] [?] Remove unused globals in resource manager implementation. --- .../core/include/irods/irods_resource_manager.hpp | 14 +++----------- server/core/src/irods_resource_manager.cpp | 7 ------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/server/core/include/irods/irods_resource_manager.hpp b/server/core/include/irods/irods_resource_manager.hpp index 28d1b13514..7479bd6189 100644 --- a/server/core/include/irods/irods_resource_manager.hpp +++ b/server/core/include/irods/irods_resource_manager.hpp @@ -1,7 +1,6 @@ -#ifndef __IRODS_RESOURCE_MANAGER_HPP__ -#define __IRODS_RESOURCE_MANAGER_HPP__ +#ifndef IRODS_RESOURCE_MANAGER_HPP +#define IRODS_RESOURCE_MANAGER_HPP -// =-=-=-=-=-=-=- #include "irods/rods.h" #include "irods/irods_resource_plugin.hpp" #include "irods/irods_first_class_object.hpp" @@ -17,12 +16,6 @@ namespace irods /// @brief definition of the resource interface extern const std::string RESOURCE_INTERFACE; - // =-=-=-=-=-=-=- - /// @brief special resource for local file system operations only - extern const std::string LOCAL_USE_ONLY_RESOURCE; - extern const std::string LOCAL_USE_ONLY_RESOURCE_VAULT; - extern const std::string LOCAL_USE_ONLY_RESOURCE_TYPE; - class resource_manager { public: // =-=-=-=-=-=-=- @@ -289,8 +282,7 @@ namespace irods lookup_table< resource_ptr > resource_name_map_; lookup_table< resource_ptr, long, std::hash > resource_id_map_; std::vector< std::vector< pdmo_type > > maintenance_operations_; - }; // class resource_manager } // namespace irods -#endif // __IRODS_RESOURCE_MANAGER_HPP__ +#endif // IRODS_RESOURCE_MANAGER_HPP diff --git a/server/core/src/irods_resource_manager.cpp b/server/core/src/irods_resource_manager.cpp index 09ca76f270..6715f5d3f8 100644 --- a/server/core/src/irods_resource_manager.cpp +++ b/server/core/src/irods_resource_manager.cpp @@ -38,13 +38,6 @@ namespace irods /// @brief definition of the resource interface const std::string RESOURCE_INTERFACE( "irods_resource_interface" ); - // =-=-=-=-=-=-=- - /// @brief special resource for local file system operations only - const std::string LOCAL_USE_ONLY_RESOURCE( "LOCAL_USE_ONLY_RESOURCE" ); - const std::string LOCAL_USE_ONLY_RESOURCE_VAULT( // TODO This does not appear to be used. - (get_irods_home_directory() / "LOCAL_USE_ONLY_RESOURCE_VAULT").string()); - const std::string LOCAL_USE_ONLY_RESOURCE_TYPE( "unixfilesystem" ); - // =-=-=-=-=-=-=- // public - Constructor resource_manager::resource_manager() {