summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-05-23 19:02:26 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-05-23 19:02:26 (GMT)
commit0c4eba31839a8174a8d7776b0f55fcbd12899d10 (patch)
treed12027713968332f98eee44e6671e95f0f5682ca /Swiften/Elements/MUCUserPayload.h
parent182bdd709a57ab4d17f163ae28c5663fb3dd4287 (diff)
parent3f72e2c3b7ce5a83287dc136c68b7ef6d2cc66bd (diff)
downloadswift-contrib-0c4eba31839a8174a8d7776b0f55fcbd12899d10.zip
swift-contrib-0c4eba31839a8174a8d7776b0f55fcbd12899d10.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed const references to vectors. Conflicts: Swiften/Elements/JinglePayload.h Swiften/Jingle/JingleSession.h
Diffstat (limited to 'Swiften/Elements/MUCUserPayload.h')
-rw-r--r--Swiften/Elements/MUCUserPayload.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Elements/MUCUserPayload.h b/Swiften/Elements/MUCUserPayload.h
index b142a8d..0276964 100644
--- a/Swiften/Elements/MUCUserPayload.h
+++ b/Swiften/Elements/MUCUserPayload.h
@@ -52,9 +52,9 @@ namespace Swift {
void addStatusCode(StatusCode code) {statusCodes_.push_back(code);}
- const std::vector<Item> getItems() const {return items_;}
+ const std::vector<Item>& getItems() const {return items_;}
- const std::vector<StatusCode> getStatusCodes() const {return statusCodes_;}
+ const std::vector<StatusCode>& getStatusCodes() const {return statusCodes_;}
private:
std::vector<Item> items_;