diff options
author | Tobias Markmann <tm@ayena.de> | 2016-04-01 17:23:49 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2016-04-04 08:28:23 (GMT) |
commit | 741c45b74d5f634622eb5f757c49323274fb8937 (patch) | |
tree | b9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Swiften/Serializer/PayloadSerializers/MUCItemSerializer.h | |
parent | eddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff) | |
download | swift-741c45b74d5f634622eb5f757c49323274fb8937.zip swift-741c45b74d5f634622eb5f757c49323274fb8937.tar.bz2 |
Modernize code to use C++11 shared_ptr instead of Boost's
This change was done by applying the following 'gsed'
replacement calls to all source files:
's/\#include <boost\/shared_ptr\.hpp>/\#include <memory>/g'
's/\#include <boost\/enable_shared_from_this\.hpp>/\#include <memory>/g'
's/\#include <boost\/smart_ptr\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/weak_ptr\.hpp>/\#include <memory>/g'
's/boost::make_shared/std::make_shared/g'
's/boost::dynamic_pointer_cast/std::dynamic_pointer_cast/g'
's/boost::shared_ptr/std::shared_ptr/g'
's/boost::weak_ptr/std::weak_ptr/g'
's/boost::enable_shared_from_this/std::enable_shared_from_this/g'
The remaining issues have been fixed manually.
Test-Information:
Code builds on OS X 10.11.4 and unit tests pass.
Change-Id: Ia7ae34eab869fb9ad6387a1348426b71ae4acd5f
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/MUCItemSerializer.h')
-rw-r--r-- | Swiften/Serializer/PayloadSerializers/MUCItemSerializer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/MUCItemSerializer.h b/Swiften/Serializer/PayloadSerializers/MUCItemSerializer.h index 016caf4..22f7859 100644 --- a/Swiften/Serializer/PayloadSerializers/MUCItemSerializer.h +++ b/Swiften/Serializer/PayloadSerializers/MUCItemSerializer.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/smart_ptr/make_shared.hpp> +#include <memory> #include <Swiften/Elements/MUCItem.h> #include <Swiften/Serializer/GenericPayloadSerializer.h> @@ -40,8 +40,8 @@ namespace Swift { } - static boost::shared_ptr<XMLElement> itemToElement(const MUCItem& item) { - boost::shared_ptr<XMLElement> itemElement(new XMLElement("item")); + static std::shared_ptr<XMLElement> itemToElement(const MUCItem& item) { + std::shared_ptr<XMLElement> itemElement(new XMLElement("item")); if (item.affiliation) { itemElement->setAttribute("affiliation", affiliationToString(item.affiliation.get())); } @@ -55,13 +55,13 @@ namespace Swift { itemElement->setAttribute("nick", item.nick.get()); } if (item.actor) { - boost::shared_ptr<XMLElement> actorElement(new XMLElement("actor")); + std::shared_ptr<XMLElement> actorElement(new XMLElement("actor")); actorElement->setAttribute("jid", item.actor->toString()); itemElement->addNode(actorElement); } if (item.reason) { - boost::shared_ptr<XMLElement> reasonElement(new XMLElement("reason")); - reasonElement->addNode(boost::make_shared<XMLTextNode>(*item.reason)); + std::shared_ptr<XMLElement> reasonElement(new XMLElement("reason")); + reasonElement->addNode(std::make_shared<XMLTextNode>(*item.reason)); itemElement->addNode(reasonElement); } return itemElement; |