Update static plugin registry integration

Author: SineStriker

include/stdcorelib/plugin/plugin.h

@@ -71,13 +71,7 @@ namespace stdc::plugin {
 
 }
 
-#if !defined(STDC_PLUGIN_LIBRARY) && defined(_MSC_VER)
-// MSVC needs the dllimport declaration when inline registry code references the
-// exported _head and _tail data members. GNU-family compilers must instantiate
-// AddFactory locally because an outer explicit instantiation does not instantiate
-// the nested class.
-extern template class STDC_PLUGIN_EXPORT stdc::StaticRegistry<stdc::plugin::StaticPlugin>;
-#endif
+STDC_DECLARE_EXPORTED_STATIC_REGISTRY(stdc::plugin::StaticPlugin, STDC_PLUGIN_EXPORT)
 
 /// The entry-point symbol exported by a dynamic plugin.
 #define STDC_PLUGIN_INSTANCE_SYMBOL "stdc_plugin_instance"

src/plugin/pluginfactory.cpp

@@ -18,7 +18,7 @@
 
 namespace fs = std::filesystem;
 
-STDC_INSTANTIATE_STATIC_REGISTRY_EXPORT(stdc::plugin::StaticPlugin, STDC_PLUGIN_EXPORT)
+STDC_STATIC_REGISTRY(stdc::plugin::StaticPlugin)
 
 namespace stdc::plugin {
 

src/plugin/pluginloader.cpp

@@ -244,16 +244,19 @@ namespace stdc::plugin {
     PluginLoader::PluginLoader(const std::filesystem::path &filePath,
                                const std::optional<std::filesystem::path> &metadataPath)
         : PluginLoader() {
-        _impl->readLibrary(filePath, metadataPath);
+        stdc_impl_t;
+        impl.readLibrary(filePath, metadataPath);
     }
 
     PluginLoader::PluginLoader(const StaticPlugin &plugin) : PluginLoader() {
-        _impl->setStaticPlugin(plugin);
+        stdc_impl_t;
+        impl.setStaticPlugin(plugin);
     }
 
     PluginLoader::PluginLoader(std::string_view iid, Plugin *plugin, const json::Value &metadata)
         : PluginLoader() {
-        _impl->setRuntimePlugin(iid, plugin, metadata);
+        stdc_impl_t;
+        impl.setRuntimePlugin(iid, plugin, metadata);
     }
 
     PluginLoader::~PluginLoader() = default;