diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-08-11 20:04:19 +0100 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-08-11 20:04:19 +0100 |
commit | 49b4fa8e70a76a48e82bd6364946039a620197f6 (patch) | |
tree | df23a4fbf3c5863045b36be3d064994e417165e5 | |
parent | Use defaulted Ice::initialize (diff) | |
download | slicer-1.11.0.tar.bz2 slicer-1.11.0.tar.xz slicer-1.11.0.zip |
Simplified Ice::ByteSeq interfacesslicer-1.11.0
-rw-r--r-- | slicer/ice/serializer.cpp | 5 | ||||
-rw-r--r-- | slicer/ice/serializer.h | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/slicer/ice/serializer.cpp b/slicer/ice/serializer.cpp index fdda2a7..eacecf8 100644 --- a/slicer/ice/serializer.cpp +++ b/slicer/ice/serializer.cpp @@ -20,17 +20,16 @@ namespace Slicer { { ic->destroy(); } - IceBlobSerializer::IceBlobSerializer(Ice::ByteSeq & b) : refblob(b) { } void IceBlobSerializer::Serialize(ModelPartForRootPtr mp) { Ice::OutputStream s(ic); mp->Write(s); - s.finished(refblob); + s.finished(blob); } - IceStreamSerializer::IceStreamSerializer(std::ostream & os) : IceBlobSerializer(blob), strm(os) { } + IceStreamSerializer::IceStreamSerializer(std::ostream & os) : strm(os) { } void IceStreamSerializer::Serialize(ModelPartForRootPtr mp) diff --git a/slicer/ice/serializer.h b/slicer/ice/serializer.h index c45ece8..db467cd 100644 --- a/slicer/ice/serializer.h +++ b/slicer/ice/serializer.h @@ -21,12 +21,10 @@ namespace Slicer { class DLL_PUBLIC IceBlobSerializer : public Serializer, protected IceBase { public: - explicit IceBlobSerializer(Ice::ByteSeq &); - void Serialize(ModelPartForRootPtr) override; - private: - Ice::ByteSeq & refblob; + protected: + Ice::ByteSeq blob; }; class DLL_PUBLIC IceStreamSerializer : public IceBlobSerializer { @@ -37,7 +35,6 @@ namespace Slicer { protected: std::ostream & strm; - Ice::ByteSeq blob; }; class DLL_PUBLIC IceBlobDeserializer : public Deserializer, protected IceBase { |