From 2b8eec969b2cbeb151dd90cc148d65121298e460 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 15 Mar 2022 21:08:14 +0100 Subject: [PATCH] PluginInfo: remove static init and exit methods those aren't used. --- include/mapnik/plugin.hpp | 2 -- src/datasource_cache.cpp | 11 ++--------- src/plugin.cpp | 10 ---------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/include/mapnik/plugin.hpp b/include/mapnik/plugin.hpp index b730a99c0..d1907411d 100644 --- a/include/mapnik/plugin.hpp +++ b/include/mapnik/plugin.hpp @@ -45,8 +45,6 @@ class PluginInfo : util::noncopyable bool valid() const; std::string get_error() const; void* get_symbol(std::string const& sym_name) const; - static void init(); - static void exit(); private: std::string filename_; diff --git a/src/datasource_cache.cpp b/src/datasource_cache.cpp index bcb5d49da..8e08d19a0 100644 --- a/src/datasource_cache.cpp +++ b/src/datasource_cache.cpp @@ -54,15 +54,8 @@ bool is_input_plugin(std::string const& filename) return boost::algorithm::ends_with(filename, std::string(".input")); } -datasource_cache::datasource_cache() -{ - PluginInfo::init(); -} - -datasource_cache::~datasource_cache() -{ - PluginInfo::exit(); -} +datasource_cache::datasource_cache() {} +datasource_cache::~datasource_cache() {} datasource_ptr datasource_cache::create(parameters const& params) { diff --git a/src/plugin.cpp b/src/plugin.cpp index 339a51df3..fb37f9a03 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -146,14 +146,4 @@ std::string PluginInfo::get_error() const return std::string{"could not open: '"} + module_->name + "'. Error: " + module_->error_str; } -void PluginInfo::init() -{ - // do any initialization needed -} - -void PluginInfo::exit() -{ - // do any shutdown needed -} - } // namespace mapnik