Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2014-09-16 13:23:24 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2014-09-16 13:23:37 (GMT) |
| commit | dc48cc3f34e3e229172202717520e77233c37ed7 (patch) | |
| tree | dd4b6562a806aa9b11f800e91ed93546fce23f35 /Swiften/Serializer | |
| parent | 381b22fc365c27b9cd585f4b78f53ebc698d9f54 (diff) | |
| download | swift-contrib-dc48cc3f34e3e229172202717520e77233c37ed7.zip swift-contrib-dc48cc3f34e3e229172202717520e77233c37ed7.tar.bz2 | |
Fix boost::optional abuses that stop compilation with latest boost
Test-Information:
Compiles and unit tests pass with boost 1.56
Change-Id: I6525399babc5f6c88fb499af80e9f07c1c4d0cdb
Diffstat (limited to 'Swiften/Serializer')
| -rw-r--r-- | Swiften/Serializer/StreamResumeSerializer.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Serializer/StreamResumedSerializer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Serializer/StreamResumeSerializer.cpp b/Swiften/Serializer/StreamResumeSerializer.cpp index 902ab21..229b826 100644 --- a/Swiften/Serializer/StreamResumeSerializer.cpp +++ b/Swiften/Serializer/StreamResumeSerializer.cpp @@ -22,7 +22,7 @@ SafeByteArray StreamResumeSerializer::serialize(boost::shared_ptr<ToplevelElemen XMLElement element("resume", "urn:xmpp:sm:2"); element.setAttribute("previd", e->getResumeID()); if (e->getHandledStanzasCount()) { - element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount())); + element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount().get())); } return createSafeByteArray(element.serialize()); } diff --git a/Swiften/Serializer/StreamResumedSerializer.cpp b/Swiften/Serializer/StreamResumedSerializer.cpp index 6477af9..48dbe8f 100644 --- a/Swiften/Serializer/StreamResumedSerializer.cpp +++ b/Swiften/Serializer/StreamResumedSerializer.cpp @@ -22,7 +22,7 @@ SafeByteArray StreamResumedSerializer::serialize(boost::shared_ptr<ToplevelEleme XMLElement element("resumed", "urn:xmpp:sm:2"); element.setAttribute("previd", e->getResumeID()); if (e->getHandledStanzasCount()) { - element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount())); + element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount().get())); } return createSafeByteArray(element.serialize()); } |