summaryrefslogtreecommitdiff
path: root/icespider/xslt
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2018-04-15 12:09:27 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2018-04-15 12:09:27 +0100
commitda393fc67ebce5fa269615c5c967f1467dc0d5cf (patch)
treeffeaef182861b2f43c2d3a1c00927326229a55c3 /icespider/xslt
parentDedupe map dumping (diff)
downloadicespider-da393fc67ebce5fa269615c5c967f1467dc0d5cf.tar.bz2
icespider-da393fc67ebce5fa269615c5c967f1467dc0d5cf.tar.xz
icespider-da393fc67ebce5fa269615c5c967f1467dc0d5cf.zip
C++17 and Ice 3.7icespider-0.4
Update all code to be C++17 with Ice 3.7 and minor interface changes in keeping with C++CG and dependencies.
Diffstat (limited to 'icespider/xslt')
-rw-r--r--icespider/xslt/Jamfile.jam2
-rw-r--r--icespider/xslt/xsltStreamSerializer.cpp4
-rw-r--r--icespider/xslt/xsltStreamSerializer.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/icespider/xslt/Jamfile.jam b/icespider/xslt/Jamfile.jam
index 97408be..eacdda4 100644
--- a/icespider/xslt/Jamfile.jam
+++ b/icespider/xslt/Jamfile.jam
@@ -2,7 +2,6 @@ lib adhocutil : : : : <include>/usr/include/adhocutil ;
lib slicer-xml : : : : <include>/usr/include/slicer ;
lib boost_system ;
lib boost_filesystem ;
-lib IceUtil ;
lib xslt ;
lib exslt ;
@@ -13,7 +12,6 @@ lib icespider-xslt :
<library>slicer-xml
<library>boost_system
<library>boost_filesystem
- <library>IceUtil
<library>xslt
<library>exslt
<library>../..//libxmlpp
diff --git a/icespider/xslt/xsltStreamSerializer.cpp b/icespider/xslt/xsltStreamSerializer.cpp
index d89adcd..5214ab3 100644
--- a/icespider/xslt/xsltStreamSerializer.cpp
+++ b/icespider/xslt/xsltStreamSerializer.cpp
@@ -29,7 +29,7 @@ namespace IceSpider {
xsltFreeStylesheet(stylesheet);
}
- XsltStreamSerializer *
+ Slicer::SerializerPtr
XsltStreamSerializer::IceSpiderFactory::create(std::ostream & strm) const
{
auto newMtime = boost::filesystem::last_write_time(stylesheetPath);
@@ -43,7 +43,7 @@ namespace IceSpider {
}
stylesheetWriteTime = newMtime;
}
- return new XsltStreamSerializer(strm, stylesheet);
+ return std::make_shared<XsltStreamSerializer>(strm, stylesheet);
}
XsltStreamSerializer::XsltStreamSerializer(std::ostream & os, xsltStylesheet * ss) :
diff --git a/icespider/xslt/xsltStreamSerializer.h b/icespider/xslt/xsltStreamSerializer.h
index b061012..eb432fb 100644
--- a/icespider/xslt/xsltStreamSerializer.h
+++ b/icespider/xslt/xsltStreamSerializer.h
@@ -14,7 +14,7 @@ namespace IceSpider {
IceSpiderFactory(const char *);
~IceSpiderFactory();
- XsltStreamSerializer * create(std::ostream &) const override;
+ Slicer::SerializerPtr create(std::ostream &) const override;
private:
const boost::filesystem::path stylesheetPath;