summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-11-28 12:08:54 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-11-28 12:18:04 (GMT)
commitf4e2f1deecd322e859bfb27bc5a9ab97726481c5 (patch)
treeb50dc4515108f5a19cbbd4b615cff01c13c5866c /Swiften/Elements
parent5caf2316dad81d6c02ff3e886a65121011ccc9fe (diff)
downloadswift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.zip
swift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.tar.bz2
Change error from optional to shared_ptr in GenericRequest
Resolves: #692
Diffstat (limited to 'Swiften/Elements')
-rw-r--r--Swiften/Elements/ErrorPayload.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Elements/ErrorPayload.h b/Swiften/Elements/ErrorPayload.h
index 9f00d53..8f849f2 100644
--- a/Swiften/Elements/ErrorPayload.h
+++ b/Swiften/Elements/ErrorPayload.h
@@ -6,12 +6,16 @@
#pragma once
+#include <boost/shared_ptr.hpp>
+
#include "Swiften/Elements/Payload.h"
#include "Swiften/Base/String.h"
namespace Swift {
class ErrorPayload : public Payload {
public:
+ typedef boost::shared_ptr<ErrorPayload> ref;
+
enum Type { Cancel, Continue, Modify, Auth, Wait };
enum Condition {
@@ -41,10 +45,6 @@ namespace Swift {
ErrorPayload(Condition condition = UndefinedCondition, Type type = Cancel, const String& text = String()) : type_(type), condition_(condition), text_(text) { }
- ErrorPayload(const ErrorPayload& other) : Payload(), type_(other.getType()), condition_(other.getCondition()), text_(other.getText()) {
-
- }
-
Type getType() const {
return type_;
}