summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-08-20 14:30:11 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2016-08-20 14:30:11 +0100
commitb1725b4234cbe685e42fbd738e7497bcc440c06c (patch)
treec264c97bf56241b1032b9fb8862569157b436dd6
parentAdd missing default value for hasUserSource (diff)
downloadicespider-b1725b4234cbe685e42fbd738e7497bcc440c06c.tar.bz2
icespider-b1725b4234cbe685e42fbd738e7497bcc440c06c.tar.xz
icespider-b1725b4234cbe685e42fbd738e7497bcc440c06c.zip
Don't store the plugin, just its implementation
-rw-r--r--icespider/core/irouteHandler.cpp4
-rw-r--r--icespider/core/irouteHandler.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/icespider/core/irouteHandler.cpp b/icespider/core/irouteHandler.cpp
index 11d18e8..dcbab7d 100644
--- a/icespider/core/irouteHandler.cpp
+++ b/icespider/core/irouteHandler.cpp
@@ -17,7 +17,7 @@ namespace IceSpider {
auto globalSerializers = AdHoc::PluginManager::getDefault()->getAll<Slicer::StreamSerializerFactory>();
for (const auto & gs : globalSerializers) {
auto slash = gs->name.find('/');
- routeSerializers.insert({ { gs->name.substr(0, slash), gs->name.substr(slash + 1) }, gs });
+ routeSerializers.insert({ { gs->name.substr(0, slash), gs->name.substr(slash + 1) }, gs->implementation() });
}
}
@@ -32,7 +32,7 @@ namespace IceSpider {
{
for (const auto & rs : routeSerializers) {
if ((!grp || rs.first.first == grp) && (!type || rs.first.second == type)) {
- return rs.second->implementation()->create(strm);
+ return rs.second->create(strm);
}
}
return nullptr;
diff --git a/icespider/core/irouteHandler.h b/icespider/core/irouteHandler.h
index 0417775..6ee8160 100644
--- a/icespider/core/irouteHandler.h
+++ b/icespider/core/irouteHandler.h
@@ -22,7 +22,7 @@ namespace IceSpider {
const HttpMethod method;
protected:
- typedef boost::shared_ptr<const AdHoc::PluginOf<Slicer::StreamSerializerFactory>> StreamSerializerFactoryPtr;
+ typedef Slicer::StreamSerializerFactory * StreamSerializerFactoryPtr;
typedef std::pair<std::string, std::string> ContentType;
typedef std::map<ContentType, StreamSerializerFactoryPtr> RouteSerializers;
RouteSerializers routeSerializers;